From 0e4d94e36492d8a537f3068cf0b52203a08222a5 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Mon, 19 Nov 2018 14:21:10 -0800 Subject: [PATCH] Stric tnull check snippetCompletionProvider --- src/tsconfig.strictNullChecks.json | 1 + .../snippets/electron-browser/snippetCompletionProvider.ts | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/tsconfig.strictNullChecks.json b/src/tsconfig.strictNullChecks.json index 27b749f45f5..2272780c921 100644 --- a/src/tsconfig.strictNullChecks.json +++ b/src/tsconfig.strictNullChecks.json @@ -624,6 +624,7 @@ "./vs/workbench/parts/scm/electron-browser/scmUtil.ts", "./vs/workbench/parts/search/common/constants.ts", "./vs/workbench/parts/search/common/queryBuilder.ts", + "./vs/workbench/parts/snippets/electron-browser/snippetCompletionProvider.ts", "./vs/workbench/parts/snippets/electron-browser/snippets.contribution.ts", "./vs/workbench/parts/snippets/electron-browser/snippetsFile.ts", "./vs/workbench/parts/surveys/electron-browser/nps.contribution.ts", diff --git a/src/vs/workbench/parts/snippets/electron-browser/snippetCompletionProvider.ts b/src/vs/workbench/parts/snippets/electron-browser/snippetCompletionProvider.ts index 82bd65b22fa..f2abc6ac957 100644 --- a/src/vs/workbench/parts/snippets/electron-browser/snippetCompletionProvider.ts +++ b/src/vs/workbench/parts/snippets/electron-browser/snippetCompletionProvider.ts @@ -73,7 +73,7 @@ export class SnippetCompletionProvider implements CompletionItemProvider { // } - provideCompletionItems(model: ITextModel, position: Position): Promise { + provideCompletionItems(model: ITextModel, position: Position): Promise | undefined { if (position.column >= SnippetCompletionProvider._maxPrefix) { return undefined; @@ -156,8 +156,8 @@ export class SnippetCompletionProvider implements CompletionItemProvider { // snippets, else fall back to the outer language model.tokenizeIfCheap(position.lineNumber); let languageId = model.getLanguageIdAtPosition(position.lineNumber, position.column); - let { language } = this._modeService.getLanguageIdentifier(languageId); - if (!this._modeService.getLanguageName(language)) { + const languageIdentifier = this._modeService.getLanguageIdentifier(languageId); + if (languageIdentifier && !this._modeService.getLanguageName(languageIdentifier.language)) { languageId = model.getLanguageIdentifier().id; } return languageId; -- GitLab