From 1ff383c64fa8ae10f46cd10475d320fa3a3c66df Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Tue, 11 Sep 2018 11:20:38 -0700 Subject: [PATCH] Split useCodeSnippetsOnMethodSuggest into js and ts specific settings Splits the old setting into `javascript.suggest.insertParametersForFunctionCalls` and `typescriptscript.suggest.insertParametersForFunctionCalls` Fixes #58385 --- .../typescript-language-features/package.json | 13 +++++++++++++ .../typescript-language-features/package.nls.json | 2 ++ .../src/features/completions.ts | 5 +++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json index 4e5a46671d9..8079c81a0cb 100644 --- a/extensions/typescript-language-features/package.json +++ b/extensions/typescript-language-features/package.json @@ -145,6 +145,19 @@ "type": "boolean", "default": false, "description": "%typescript.useCodeSnippetsOnMethodSuggest.dec%", + "scope": "resource", + "deprecationMessage": "%typescript.useCodeSnippetsOnMethodSuggest.deprecationMessage%" + }, + "javascript.suggest.insertParametersForFunctionCalls": { + "type": "boolean", + "default": false, + "description": "%configuration.suggest.insertParametersForFunctionCalls%", + "scope": "resource" + }, + "typescript.suggest.insertParametersForFunctionCalls": { + "type": "boolean", + "default": false, + "description": "%configuration.suggest.insertParametersForFunctionCalls%", "scope": "resource" }, "typescript.reportStyleChecksAsWarnings": { diff --git a/extensions/typescript-language-features/package.nls.json b/extensions/typescript-language-features/package.nls.json index 443ecfa32c9..7910e76f775 100644 --- a/extensions/typescript-language-features/package.nls.json +++ b/extensions/typescript-language-features/package.nls.json @@ -4,6 +4,8 @@ "reloadProjects.title": "Reload Project", "configuration.typescript": "TypeScript", "typescript.useCodeSnippetsOnMethodSuggest.dec": "Complete functions with their parameter signature.", + "typescript.useCodeSnippetsOnMethodSuggest.deprecationMessage": "Please use the new `javascript.suggest.insertParametersForFunctionCalls` and `typescriptscript.suggest.insertParametersForFunctionCalls` settings.", + "configuration.suggest.insertParametersForFunctionCalls": "Complete functions with their parameter signature.", "typescript.tsdk.desc": "Specifies the folder path containing the tsserver and lib*.d.ts files to use.", "typescript.disableAutomaticTypeAcquisition": "Disables automatic type acquisition.", "typescript.tsserver.log": "Enables logging of the TS server to a file. This log can be used to diagnose TS Server issues. The log may contain file paths, source code, and other potentially sensitive information from your project.", diff --git a/extensions/typescript-language-features/src/features/completions.ts b/extensions/typescript-language-features/src/features/completions.ts index 0ae86f53c9e..8701f38928c 100644 --- a/extensions/typescript-language-features/src/features/completions.ts +++ b/extensions/typescript-language-features/src/features/completions.ts @@ -241,7 +241,8 @@ interface CompletionConfiguration { } namespace CompletionConfiguration { - export const useCodeSnippetsOnMethodSuggest = 'useCodeSnippetsOnMethodSuggest'; + export const useCodeSnippetsOnMethodSuggest = 'suggest.insertParametersForFunctionCalls'; + export const useCodeSnippetsOnMethodSuggest_deprecated = 'useCodeSnippetsOnMethodSuggest'; export const nameSuggestions = 'suggest.names'; export const nameSuggestions_deprecated = 'nameSuggestions'; export const pathSuggestions = 'suggest.paths'; @@ -258,7 +259,7 @@ namespace CompletionConfiguration { const typeScriptConfig = vscode.workspace.getConfiguration('typescript', resource); return { - useCodeSnippetsOnMethodSuggest: typeScriptConfig.get(CompletionConfiguration.useCodeSnippetsOnMethodSuggest, false), + useCodeSnippetsOnMethodSuggest: config.get(CompletionConfiguration.useCodeSnippetsOnMethodSuggest, typeScriptConfig.get(CompletionConfiguration.useCodeSnippetsOnMethodSuggest_deprecated, false)), pathSuggestions: config.get(CompletionConfiguration.pathSuggestions, true), autoImportSuggestions: config.get(CompletionConfiguration.autoImportSuggestions, typeScriptConfig.get(CompletionConfiguration.autoImportSuggestions_deprecated, true)), nameSuggestions: config.get(CompletionConfiguration.nameSuggestions, vscode.workspace.getConfiguration('javascript', resource).get(CompletionConfiguration.nameSuggestions_deprecated, true))