提交 0e4d94e3 编写于 作者: M Matt Bierner

Stric tnull check snippetCompletionProvider

上级 0cbb21ae
......@@ -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",
......
......@@ -73,7 +73,7 @@ export class SnippetCompletionProvider implements CompletionItemProvider {
//
}
provideCompletionItems(model: ITextModel, position: Position): Promise<CompletionList> {
provideCompletionItems(model: ITextModel, position: Position): Promise<CompletionList> | 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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册