From 031304cc81716aecc93c8ec47cd8a0eb3099a708 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Fri, 27 Oct 2017 14:27:32 -0700 Subject: [PATCH] Use resource setting for jsdoc completions config --- .../src/features/jsDocCompletionProvider.ts | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/extensions/typescript/src/features/jsDocCompletionProvider.ts b/extensions/typescript/src/features/jsDocCompletionProvider.ts index 0c7efba6b55..47f264c35ea 100644 --- a/extensions/typescript/src/features/jsDocCompletionProvider.ts +++ b/extensions/typescript/src/features/jsDocCompletionProvider.ts @@ -14,11 +14,6 @@ const localize = nls.loadMessageBundle(); const configurationNamespace = 'jsDocCompletion'; - -interface Configuration { - enabled: boolean; -} - namespace Configuration { export const enabled = 'enabled'; } @@ -51,20 +46,16 @@ class JsDocCompletionItem extends CompletionItem { } export class JsDocCompletionProvider implements CompletionItemProvider { - private config: Configuration; constructor( private client: ITypescriptServiceClient, - ) { - this.config = { enabled: true }; - } + ) { } - public updateConfiguration(): void { - const jsDocCompletionConfig = workspace.getConfiguration(configurationNamespace); - this.config.enabled = jsDocCompletionConfig.get(Configuration.enabled, true); - } - - public provideCompletionItems(document: TextDocument, position: Position, _token: CancellationToken): ProviderResult { + public provideCompletionItems( + document: TextDocument, + position: Position, + _token: CancellationToken + ): ProviderResult { const file = this.client.normalizePath(document.uri); if (!file) { return []; @@ -75,7 +66,8 @@ export class JsDocCompletionProvider implements CompletionItemProvider { const line = document.lineAt(position.line).text; const prefix = line.slice(0, position.character); if (prefix.match(/^\s*$|\/\*\*\s*$|^\s*\/\*\*+\s*$/)) { - return [new JsDocCompletionItem(document, position, this.config.enabled)]; + const enableJsDocCompletions = workspace.getConfiguration(configurationNamespace).get(Configuration.enabled, true); + return [new JsDocCompletionItem(document, position, enableJsDocCompletions)]; } return []; }