From caf179a48f2adc2ec999765670361c4466e9d207 Mon Sep 17 00:00:00 2001 From: Simon H <5968653+dummdidumm@users.noreply.github.com> Date: Tue, 14 Jun 2022 20:11:43 +0200 Subject: [PATCH] (fix) remove some options (#1520) These options don't make sense to be toggleable, because the user has to perform an explicit action to use them, and because we can't hide/disable the corresponding menu entries/shortcuts if the user choses to disable them --- packages/language-server/README.md | 20 ----------- packages/language-server/src/ls-config.ts | 34 +----------------- .../src/plugins/html/HTMLPlugin.ts | 8 ----- .../plugins/typescript/TypeScriptPlugin.ts | 32 ----------------- packages/svelte-vscode/package.json | 36 ------------------- 5 files changed, 1 insertion(+), 129 deletions(-) diff --git a/packages/language-server/README.md b/packages/language-server/README.md index e5e350584..e3c04d648 100644 --- a/packages/language-server/README.md +++ b/packages/language-server/README.md @@ -119,14 +119,6 @@ Enable document symbols for TypeScript. _Default_: `true` Enable completions for TypeScript. _Default_: `true` -##### `svelte.plugin.typescript.findReferences.enable` - -Enable find-references for TypeScript. _Default_: `true` - -##### `svelte.plugin.typescript.definitions.enable` - -Enable go to definition for TypeScript. _Default_: `true` - ##### `svelte.plugin.typescript.codeActions.enable` Enable code actions for TypeScript. _Default_: `true` @@ -135,10 +127,6 @@ Enable code actions for TypeScript. _Default_: `true` Enable selection range for TypeScript. _Default_: `true` -##### `svelte.plugin.typescript.rename.enable` - -Enable rename functionality for JS/TS variables inside Svelte files. _Default_: `true` - ##### `svelte.plugin.typescript.signatureHelp.enable` Enable signature help (parameter hints) for JS/TS. _Default_: `true` @@ -147,10 +135,6 @@ Enable signature help (parameter hints) for JS/TS. _Default_: `true` Enable semantic tokens (semantic highlight) for TypeScript. _Default_: `true` -##### `svelte.plugin.typescript.implementation.enable` - -Enable go to implementation for Typescript. _Default_: `true` - ##### `svelte.plugin.css.enable` Enable the CSS plugin. _Default_: `true` @@ -221,10 +205,6 @@ Enable document symbols for HTML. _Default_: `true` Enable Linked Editing for HTML. _Default_: `true` -##### `svelte.plugin.html.renameTags.enable` - -Enable rename tags for the opening/closing tag pairs in HTML. _Default_: `true` - ##### `svelte.plugin.svelte.enable` Enable the Svelte plugin. _Default_: `true` diff --git a/packages/language-server/src/ls-config.ts b/packages/language-server/src/ls-config.ts index 4c9b2c88f..db968de4e 100644 --- a/packages/language-server/src/ls-config.ts +++ b/packages/language-server/src/ls-config.ts @@ -12,18 +12,11 @@ const defaultLSConfig: LSConfig = { diagnostics: { enable: true }, hover: { enable: true }, completions: { enable: true }, - definitions: { enable: true }, - findReferences: { enable: true }, - fileReferences: { enable: true }, - findComponentReferences: { enable: true }, documentSymbols: { enable: true }, codeActions: { enable: true }, - rename: { enable: true }, selectionRange: { enable: true }, signatureHelp: { enable: true }, - semanticTokens: { enable: true }, - implementation: { enable: true }, - typeDefinition: { enable: true } + semanticTokens: { enable: true } }, css: { enable: true, @@ -42,7 +35,6 @@ const defaultLSConfig: LSConfig = { completions: { enable: true, emmet: true }, tagComplete: { enable: true }, documentSymbols: { enable: true }, - renameTags: { enable: true }, linkedEditing: { enable: true } }, svelte: { @@ -96,24 +88,9 @@ export interface LSTypescriptConfig { completions: { enable: boolean; }; - findReferences: { - enable: boolean; - }; - fileReferences: { - enable: boolean; - }; - findComponentReferences: { - enable: boolean; - }; - definitions: { - enable: boolean; - }; codeActions: { enable: boolean; }; - rename: { - enable: boolean; - }; selectionRange: { enable: boolean; }; @@ -123,12 +100,6 @@ export interface LSTypescriptConfig { semanticTokens: { enable: boolean; }; - implementation: { - enable: boolean; - }; - typeDefinition: { - enable: boolean; - }; } export interface LSCSSConfig { @@ -173,9 +144,6 @@ export interface LSHTMLConfig { documentSymbols: { enable: boolean; }; - renameTags: { - enable: boolean; - }; linkedEditing: { enable: boolean; }; diff --git a/packages/language-server/src/plugins/html/HTMLPlugin.ts b/packages/language-server/src/plugins/html/HTMLPlugin.ts index 8da3f3576..34bebeb86 100644 --- a/packages/language-server/src/plugins/html/HTMLPlugin.ts +++ b/packages/language-server/src/plugins/html/HTMLPlugin.ts @@ -234,10 +234,6 @@ export class HTMLPlugin } rename(document: Document, position: Position, newName: string): WorkspaceEdit | null { - if (!this.featureEnabled('renameTags')) { - return null; - } - const html = this.documents.get(document); if (!html) { return null; @@ -252,10 +248,6 @@ export class HTMLPlugin } prepareRename(document: Document, position: Position): Range | null { - if (!this.featureEnabled('renameTags')) { - return null; - } - const html = this.documents.get(document); if (!html) { return null; diff --git a/packages/language-server/src/plugins/typescript/TypeScriptPlugin.ts b/packages/language-server/src/plugins/typescript/TypeScriptPlugin.ts index 2f58268be..108067ca0 100644 --- a/packages/language-server/src/plugins/typescript/TypeScriptPlugin.ts +++ b/packages/language-server/src/plugins/typescript/TypeScriptPlugin.ts @@ -329,10 +329,6 @@ export class TypeScriptPlugin } async getDefinitions(document: Document, position: Position): Promise { - if (!this.featureEnabled('definitions')) { - return []; - } - const { lang, tsDoc } = await this.getLSAndTSDoc(document); const mainFragment = tsDoc.getFragment(); @@ -369,10 +365,6 @@ export class TypeScriptPlugin } async prepareRename(document: Document, position: Position): Promise { - if (!this.featureEnabled('rename')) { - return null; - } - return this.renameProvider.prepareRename(document, position); } @@ -381,10 +373,6 @@ export class TypeScriptPlugin position: Position, newName: string ): Promise { - if (!this.featureEnabled('rename')) { - return null; - } - return this.renameProvider.rename(document, position, newName); } @@ -431,26 +419,14 @@ export class TypeScriptPlugin position: Position, context: ReferenceContext ): Promise { - if (!this.featureEnabled('findReferences')) { - return null; - } - return this.findReferencesProvider.findReferences(document, position, context); } async fileReferences(uri: string): Promise { - if (!this.featureEnabled('fileReferences')) { - return null; - } - return this.findFileReferencesProvider.fileReferences(uri); } async findComponentReferences(uri: string): Promise { - if (!this.featureEnabled('findComponentReferences')) { - return null; - } - return this.findComponentReferencesProvider.findComponentReferences(uri); } @@ -536,18 +512,10 @@ export class TypeScriptPlugin } async getImplementation(document: Document, position: Position): Promise { - if (!this.featureEnabled('implementation')) { - return null; - } - return this.implementationProvider.getImplementation(document, position); } async getTypeDefinition(document: Document, position: Position): Promise { - if (!this.featureEnabled('typeDefinition')) { - return null; - } - return this.typeDefinitionProvider.getTypeDefinition(document, position); } diff --git a/packages/svelte-vscode/package.json b/packages/svelte-vscode/package.json index ad4c28652..1acb657dc 100644 --- a/packages/svelte-vscode/package.json +++ b/packages/svelte-vscode/package.json @@ -132,18 +132,6 @@ "title": "TypeScript: Completions", "description": "Enable completions for TypeScript" }, - "svelte.plugin.typescript.findReferences.enable": { - "type": "boolean", - "default": true, - "title": "TypeScript: Find References", - "description": "Enable find-references for TypeScript" - }, - "svelte.plugin.typescript.definitions.enable": { - "type": "boolean", - "default": true, - "title": "TypeScript: Go to Definition", - "description": "Enable go to definition for TypeScript" - }, "svelte.plugin.typescript.codeActions.enable": { "type": "boolean", "default": true, @@ -162,30 +150,12 @@ "title": "TypeScript: Signature Help", "description": "Enable signature help (parameter hints) for TypeScript" }, - "svelte.plugin.typescript.rename.enable": { - "type": "boolean", - "default": true, - "title": "TypeScript: Rename", - "description": "Enable rename functionality for JS/TS variables inside Svelte files" - }, "svelte.plugin.typescript.semanticTokens.enable": { "type": "boolean", "default": true, "title": "TypeScript: Semantic Tokens", "description": "Enable semantic tokens (semantic highlight) for TypeScript." }, - "svelte.plugin.typescript.implementation.enable": { - "type": "boolean", - "default": true, - "title": "Typescript: Go to Implementation", - "description": "Enable go to implementation for Typescript" - }, - "svelte.plugin.typescript.typeDefinition.enable": { - "type": "boolean", - "default": true, - "title": "Typescript: Go to Type Definition", - "description": "Enable go to Type Definition for Typescript" - }, "svelte.plugin.css.enable": { "type": "boolean", "default": true, @@ -288,12 +258,6 @@ "title": "HTML: Linked Editing", "description": "Enable Linked Editing for HTML" }, - "svelte.plugin.html.renameTags.enable": { - "type": "boolean", - "default": true, - "title": "HTML: Rename tags", - "description": "Enable rename for the opening/closing tag pairs in HTML" - }, "svelte.plugin.svelte.enable": { "type": "boolean", "default": true,