Skip to content

Commit

Permalink
Merge https://github.com/denoland/vscode_deno
Browse files Browse the repository at this point in the history
  • Loading branch information
@redking00
redking00 committed Feb 26, 2025
2 parents a45e7ce + c198228 commit 785cd5e
Show file tree
Hide file tree
Showing 8 changed files with 72 additions and 167 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
Releases of the extension can be downloaded from
[Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=redking00.vscode-nbts).

### [3.43.4](https://github.com/denoland/vscode_deno/compare/3.43.4...3.43.5) / 2025.02.26

- Revert "fix: move extended language formatting to client" (#1261)

### [3.43.4](https://github.com/denoland/vscode_deno/compare/3.43.3...3.43.4) / 2025.02.25

- fix: move extended language formatting to client (#1258)
Expand Down
5 changes: 0 additions & 5 deletions client/src/commands.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ import * as path from "path";
import * as process from "process";
import * as jsoncParser from "jsonc-parser/lib/esm/main.js";
import { semver } from "./semver";
import { log } from "./extension";

// deno-lint-ignore no-explicit-any
export type Callback = (...args: any[]) => unknown;
Expand Down Expand Up @@ -190,10 +189,6 @@ export function startLanguageServer(
{
outputChannel: extensionContext.outputChannel,
middleware: {
provideDocumentFormattingEdits: (document, options, token, next) => {
log("provideDocumentFormattingEdits:", document.uri.toString(), options);
return next(document, options, token)
},
workspace: {
configuration: (params, token, next) => {
const response = next(params, token) as Record<string, unknown>[];
Expand Down
114 changes: 61 additions & 53 deletions client/src/extension.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import * as util from "util";

import * as vscode from "vscode";
import { registerSidebar } from "./tasks_sidebar";
import { DENO_FORMATTING_EDIT_PROVIDER } from "./formatting";

import { NBTSSerializer } from './notebook-serializers/nbts-serializer/nbts-serializer';
import { KernelController } from './notebook-controllers/kernel-controller/kernel-controller';
Expand Down Expand Up @@ -138,25 +137,67 @@ export async function activate(
const p2cMap = new Map<string, string>();
extensionContext.clientOptions = {
documentSelector: [
{ language: "javascript", scheme: "file" },
{ language: "javascript", scheme: "untitled" },
{ language: "javascript", scheme: "deno" },
{ language: "javascript", notebook: "*" },
{ language: "javascriptreact", scheme: "file" },
{ language: "javascriptreact", scheme: "untitled" },
{ language: "javascriptreact", scheme: "deno" },
{ language: "javascriptreact", notebook: "*" },
{ language: "typescript", scheme: "file" },
{ language: "typescript", scheme: "untitled" },
{ language: "typescript", scheme: "deno" },
{ language: "typescript", notebook: "*" },
{ language: "typescriptreact", scheme: "file" },
{ language: "typescriptreact", scheme: "untitled" },
{ language: "typescriptreact", scheme: "deno" },
{ language: "typescriptreact", notebook: "*" },
{ language: "json", scheme: "file" },
{ language: "json", scheme: "untitled" },
{ language: "json", scheme: "deno" },
{ scheme: "file", language: "javascript" },
{ scheme: "file", language: "javascriptreact" },
{ scheme: "file", language: "typescript" },
{ scheme: "file", language: "typescriptreact" },
{ scheme: "file", language: "json" },
{ scheme: "file", language: "jsonc" },
{ scheme: "file", language: "markdown" },
{ scheme: "file", language: "html" },
{ scheme: "file", language: "css" },
{ scheme: "file", language: "scss" },
{ scheme: "file", language: "sass" },
{ scheme: "file", language: "less" },
{ scheme: "file", language: "yaml" },
{ scheme: "file", language: "sql" },
{ scheme: "file", language: "svelte" },
{ scheme: "file", language: "vue" },
{ scheme: "file", language: "astro" },
{ scheme: "file", language: "vento" },
{ scheme: "file", language: "nunjucks" },
{ scheme: "untitled", language: "javascript" },
{ scheme: "untitled", language: "javascriptreact" },
{ scheme: "untitled", language: "typescript" },
{ scheme: "untitled", language: "typescriptreact" },
{ scheme: "untitled", language: "json" },
{ scheme: "untitled", language: "jsonc" },
{ scheme: "untitled", language: "markdown" },
{ scheme: "untitled", language: "html" },
{ scheme: "untitled", language: "css" },
{ scheme: "untitled", language: "scss" },
{ scheme: "untitled", language: "sass" },
{ scheme: "untitled", language: "less" },
{ scheme: "untitled", language: "yaml" },
{ scheme: "untitled", language: "sql" },
{ scheme: "untitled", language: "svelte" },
{ scheme: "untitled", language: "vue" },
{ scheme: "untitled", language: "astro" },
{ scheme: "untitled", language: "vento" },
{ scheme: "untitled", language: "nunjucks" },
{ scheme: "deno", language: "javascript" },
{ scheme: "deno", language: "javascriptreact" },
{ scheme: "deno", language: "typescript" },
{ scheme: "deno", language: "typescriptreact" },
{ scheme: "deno", language: "json" },
{ scheme: "deno", language: "jsonc" },
{ scheme: "deno", language: "markdown" },
{ scheme: "deno", language: "html" },
{ scheme: "deno", language: "css" },
{ scheme: "deno", language: "scss" },
{ scheme: "deno", language: "sass" },
{ scheme: "deno", language: "less" },
{ scheme: "deno", language: "yaml" },
{ scheme: "deno", language: "sql" },
{ scheme: "deno", language: "svelte" },
{ scheme: "deno", language: "vue" },
{ scheme: "deno", language: "astro" },
{ scheme: "deno", language: "vento" },
{ scheme: "deno", language: "nunjucks" },
{ notebook: "*", language: "javascript" },
{ notebook: "*", language: "javascriptreact" },
{ notebook: "*", language: "typescript" },
{ notebook: "*", language: "typescriptreact" },
],
uriConverters: {
code2Protocol: (uri) => {
Expand Down Expand Up @@ -254,39 +295,6 @@ export async function activate(
extensionContext.tasksSidebar.refresh();
}
}));
context.subscriptions.push(
vscode.languages.registerDocumentFormattingEditProvider([
{ language: "jsonc", scheme: "file" },
{ language: "jsonc", scheme: "untitled" },
{ language: "markdown", scheme: "file" },
{ language: "markdown", scheme: "untitled" },
{ language: "html", scheme: "file" },
{ language: "html", scheme: "untitled" },
{ language: "css", scheme: "file" },
{ language: "css", scheme: "untitled" },
{ language: "scss", scheme: "file" },
{ language: "scss", scheme: "untitled" },
{ language: "sass", scheme: "file" },
{ language: "sass", scheme: "untitled" },
{ language: "less", scheme: "file" },
{ language: "less", scheme: "untitled" },
{ language: "yaml", scheme: "file" },
{ language: "yaml", scheme: "untitled" },
{ language: "sql", scheme: "file" },
{ language: "sql", scheme: "untitled" },
{ language: "svelte", scheme: "file" },
{ language: "svelte", scheme: "untitled" },
{ language: "vue", scheme: "file" },
{ language: "vue", scheme: "untitled" },
{ language: "astro", scheme: "file" },
{ language: "astro", scheme: "untitled" },
{ language: "astro", scheme: "deno" },
{ language: "vento", scheme: "file" },
{ language: "vento", scheme: "untitled" },
{ language: "nunjucks", scheme: "file" },
{ language: "nunjucks", scheme: "untitled" },
], DENO_FORMATTING_EDIT_PROVIDER),
);

const registerCommand = createRegisterCommand(context);
registerCommand("deno.client.showReferences", commands.showReferences);
Expand Down
102 changes: 0 additions & 102 deletions client/src/formatting.ts
View file

This file was deleted.

6 changes: 3 additions & 3 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Visual Studio Code plugin for Deno lsp support on notebooks (+ NBTS serializer + DenoNBTS kernel)",
"author": "redking00 & Deno Land Inc.",
"license": "MIT",
"version": "1.0.27",
"version": "1.0.28",
"icon": "deno.png",
"galleryBanner": {
"color": "#3B3738",
Expand Down
4 changes: 2 additions & 2 deletions typescript-deno-plugin/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion typescript-deno-plugin/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"author": "Deno Land Inc.",
"license": "MIT",
"private": true,
"version": "3.43.4",
"version": "3.43.5",
"publisher": "deno-land",
"main": "./dist/index",
"files": [
Expand Down

0 comments on commit 785cd5e

Please sign in to comment.