diff --git a/packages/language-server/src/ls-config.ts b/packages/language-server/src/ls-config.ts index 1dab5b107..5bb2d1c4e 100644 --- a/packages/language-server/src/ls-config.ts +++ b/packages/language-server/src/ls-config.ts @@ -38,6 +38,7 @@ const defaultLSConfig: LSConfig = { enable: true, compilerWarnings: {}, diagnostics: { enable: true }, + rename: { enable: true }, format: { enable: true }, completions: { enable: true }, hover: { enable: true }, @@ -84,7 +85,7 @@ export interface LSTypescriptConfig { enable: boolean; }; selectionRange: { - enable: boolean + enable: boolean; }; } @@ -110,7 +111,7 @@ export interface LSCSSConfig { enable: boolean; }; selectionRange: { - enable: boolean + enable: boolean; }; } @@ -141,6 +142,9 @@ export interface LSSvelteConfig { format: { enable: boolean; }; + rename: { + enable: boolean; + }; completions: { enable: boolean; }; @@ -151,7 +155,7 @@ export interface LSSvelteConfig { enable: boolean; }; selectionRange: { - enable: boolean + enable: boolean; }; } diff --git a/packages/language-server/src/plugins/typescript/TypeScriptPlugin.ts b/packages/language-server/src/plugins/typescript/TypeScriptPlugin.ts index 6de7a7b78..55173d196 100644 --- a/packages/language-server/src/plugins/typescript/TypeScriptPlugin.ts +++ b/packages/language-server/src/plugins/typescript/TypeScriptPlugin.ts @@ -317,7 +317,12 @@ export class TypeScriptPlugin } async updateImports(fileRename: FileRename): Promise { - if (!this.featureEnabled('rename')) { + if ( + !( + this.configManager.enabled('svelte.enable') && + this.configManager.enabled('svelte.rename.enable') + ) + ) { return null; } diff --git a/packages/svelte-vscode/README.md b/packages/svelte-vscode/README.md index c2c818d4d..b2894fd1f 100644 --- a/packages/svelte-vscode/README.md +++ b/packages/svelte-vscode/README.md @@ -102,6 +102,10 @@ 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.css.enable` Enable the CSS plugin. _Default_: `true` @@ -184,7 +188,7 @@ Enable autocompletion for Svelte (for tags like #if/#each). _Default_: `true` ##### `svelte.plugin.svelte.rename.enable` -Enable rename functionality (rename svelte files or variables inside svelte files). _Default_: `true` +Enable rename/move Svelte files functionality. _Default_: `true` ##### `svelte.plugin.svelte.codeActions.enable` diff --git a/packages/svelte-vscode/package.json b/packages/svelte-vscode/package.json index f5f3ec467..d1e3f774c 100644 --- a/packages/svelte-vscode/package.json +++ b/packages/svelte-vscode/package.json @@ -116,6 +116,12 @@ "title": "TypeScript: SelectionRange", "description": "Enable selection range 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.css.enable": { "type": "boolean", "default": true, @@ -254,6 +260,12 @@ "default": true, "title": "Svelte: Selection Range", "description": "Enable selection range for Svelte" + }, + "svelte.plugin.svelte.rename.enable": { + "type": "boolean", + "default": true, + "title": "Svelte: Rename", + "description": "Enable rename/move Svelte files functionality" } } },