Strict null check tabCompletions

mjbvz · mjbvz · commit c90f92f3fc3f · 2019-01-10T12:00:39.000-08:00
diff --git a/src/tsconfig.strictNullChecks.json b/src/tsconfig.strictNullChecks.json
@@ -671,6 +671,7 @@
 		"./vs/workbench/parts/snippets/electron-browser/snippets.contribution.ts",
 		"./vs/workbench/parts/snippets/electron-browser/snippetsFile.ts",
 		"./vs/workbench/parts/snippets/electron-browser/snippetsService.ts",
+		"./vs/workbench/parts/snippets/electron-browser/tabCompletion.ts",
 		"./vs/workbench/parts/snippets/test/electron-browser/snippetFile.test.ts",
 		"./vs/workbench/parts/snippets/test/electron-browser/snippetsRegistry.test.ts",
 		"./vs/workbench/parts/snippets/test/electron-browser/snippetsRewrite.test.ts",
@@ -812,6 +813,7 @@
 		"./vs/workbench/services/keybinding/test/macLinuxFallbackKeyboardMapper.test.ts",
 		"./vs/workbench/services/keybinding/test/macLinuxKeyboardMapper.test.ts",
 		"./vs/workbench/services/keybinding/test/windowsKeyboardMapper.test.ts",
+		"./vs/workbench/services/label/common/labelService.ts",
 		"./vs/workbench/services/mode/common/workbenchModeService.ts",
 		"./vs/workbench/services/notification/common/notificationService.ts",
 		"./vs/workbench/services/panel/common/panelService.ts",
diff --git a/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.ts b/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.ts
@@ -78,6 +78,10 @@ export class TabCompletionController implements editorCommon.IEditorContribution
 		// reset first
 		this._activeSnippets = [];
 
+		if (!this._editor.hasModel()) {
+			return;
+		}
+
 		// lots of dance for getting the
 		const selection = this._editor.getSelection();
 		const model = this._editor.getModel();
@@ -118,6 +122,9 @@ export class TabCompletionController implements editorCommon.IEditorContribution
 	}
 
 	performSnippetCompletions(): void {
+		if (!this._editor.hasModel()) {
+			return;
+		}
 
 		if (this._activeSnippets.length === 1) {
 			// one -> just insert
@@ -126,8 +133,8 @@ export class TabCompletionController implements editorCommon.IEditorContribution
 
 		} else if (this._activeSnippets.length > 1) {
 			// two or more -> show IntelliSense box
+			const position = this._editor.getPosition();
 			showSimpleSuggestions(this._editor, this._activeSnippets.map(snippet => {
-				const position = this._editor.getPosition();
 				const range = Range.fromPositions(position.delta(0, -snippet.prefix.length), position);
 				return new SnippetCompletion(snippet, range);
 			}));
