diff --git a/extensions/typescript/src/features/completionItemProvider.ts b/extensions/typescript/src/features/completionItemProvider.ts index 9a052483962..9364864826f 100644 --- a/extensions/typescript/src/features/completionItemProvider.ts +++ b/extensions/typescript/src/features/completionItemProvider.ts @@ -5,7 +5,7 @@ 'use strict'; -import { CompletionItem, TextDocument, Position, CompletionItemKind, CompletionItemProvider, CancellationToken, WorkspaceConfiguration, TextEdit, Range, SnippetString } from 'vscode'; +import { CompletionItem, TextDocument, Position, CompletionItemKind, CompletionItemProvider, CancellationToken, WorkspaceConfiguration, TextEdit, Range, SnippetString, workspace } from 'vscode'; import { ITypescriptServiceClient } from '../typescriptService'; @@ -87,7 +87,9 @@ export default class TypeScriptCompletionItemProvider implements CompletionItemP } public updateConfiguration(config: WorkspaceConfiguration): void { - this.config.useCodeSnippetsOnMethodSuggest = config.get(Configuration.useCodeSnippetsOnMethodSuggest, false); + // Use shared setting for js and ts + let typeScriptConfig = workspace.getConfiguration('typescript'); + this.config.useCodeSnippetsOnMethodSuggest = typeScriptConfig.get(Configuration.useCodeSnippetsOnMethodSuggest, false); } public provideCompletionItems(document: TextDocument, position: Position, token: CancellationToken): Promise { @@ -162,7 +164,7 @@ export default class TypeScriptCompletionItemProvider implements CompletionItemP item.detail = Previewer.plain(detail.displayParts); } - if (detail && this.config.useCodeSnippetsOnMethodSuggest && item.kind === CompletionItemKind.Function) { + if (detail && this.config.useCodeSnippetsOnMethodSuggest && (item.kind === CompletionItemKind.Function || item.kind === CompletionItemKind.Method)) { let codeSnippet = detail.name; let suggestionArgumentNames: string[]; diff --git a/extensions/typescript/src/features/configuration.ts b/extensions/typescript/src/features/configuration.ts deleted file mode 100644 index 58149cee275..00000000000 --- a/extensions/typescript/src/features/configuration.ts +++ /dev/null @@ -1,26 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -'use strict'; - -import { workspace } from 'vscode'; - -export interface IConfiguration { - useCodeSnippetsOnMethodSuggest?: boolean; -} - -export var defaultConfiguration: IConfiguration = { - useCodeSnippetsOnMethodSuggest: false -}; - -export function load(myPluginId: string): IConfiguration { - let configuration = workspace.getConfiguration(myPluginId); - - let useCodeSnippetsOnMethodSuggest = configuration.get('useCodeSnippetsOnMethodSuggest', defaultConfiguration.useCodeSnippetsOnMethodSuggest); - - return { - useCodeSnippetsOnMethodSuggest - }; -} \ No newline at end of file