Skip to content

Commit

Permalink
Revert "fix: move extended language formatting to client" (#1261)
Browse files Browse the repository at this point in the history 
Revert "fix: move extended language formatting to client (#1258)"

This reverts commit c60c069.
  • Loading branch information
@dsherret
dsherret authored Feb 26, 2025
1 parent 3cb0637 commit 3953217
Show file tree
Hide file tree
Showing 6 changed files with 62 additions and 191 deletions.
27 changes: 0 additions & 27 deletions client/package-lock.json
View file

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

2 changes: 0 additions & 2 deletions client/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
"vscode": "^1.77.0"
},
"dependencies": {
"@types/diff": "^7.0.1",
"diff": "^7.0.0",
"dotenv": "^16.4.5",
"jsonc-parser": "^3.2.0",
"semver": "7.5.2",
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 @@ -186,10 +185,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";

function handleConfigurationChange(event: vscode.ConfigurationChangeEvent) {
if (
Expand Down Expand Up @@ -83,25 +82,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 @@ -199,39 +240,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.

3 changes: 1 addition & 2 deletions client/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
"module": "commonjs",
"target": "es2019",
"lib": [
"ES2019",
"ES2022.Intl"
"ES2019"
],
"outDir": "out",
"rootDir": "src",
Expand Down

0 comments on commit 3953217

Please sign in to comment.