Finish strict null checks for vs/editor (microsoft#60565)

Author: alexdima

Diff for: src/tsconfig.strictNullChecks.json

@@ -8,17 +8,7 @@
 		"./typings",
 		"./vs/base/**/*.ts",
 		"./vs/code/**/*.ts",
-		"./vs/editor/browser/**/*.ts",
-		"./vs/editor/common/**/*.ts",
-		"./vs/editor/contrib/codeAction/**/*.ts",
-		"./vs/editor/contrib/format/**/*.ts",
-		"./vs/editor/contrib/gotoError/**/*.ts",
-		"./vs/editor/contrib/inPlaceReplace/**/*.ts",
-		"./vs/editor/contrib/smartSelect/**/*.ts",
-		"./vs/editor/contrib/snippet/**/*.ts",
-		"./vs/editor/contrib/suggest/**/*.ts",
-		"./vs/editor/contrib/documentSymbols/**/*.ts",
-		"./vs/editor/test/**/*.ts",
+		"./vs/editor/**/*.ts",
 		"./vs/workbench/browser/parts/notifications/**/*",
 		"./vs/workbench/browser/parts/quickinput/**/*",
 		"./vs/workbench/electron-browser/actions/**/*",
@@ -32,176 +22,6 @@
 		"./vs/workbench/services/themes/**/*.ts"
 	],
 	"files": [
-		"./vs/editor/contrib/bracketMatching/bracketMatching.ts",
-		"./vs/editor/contrib/bracketMatching/test/bracketMatching.test.ts",
-		"./vs/editor/contrib/caretOperations/caretOperations.ts",
-		"./vs/editor/contrib/caretOperations/moveCaretCommand.ts",
-		"./vs/editor/contrib/caretOperations/test/moveCarretCommand.test.ts",
-		"./vs/editor/contrib/caretOperations/transpose.ts",
-		"./vs/editor/contrib/clipboard/clipboard.ts",
-		"./vs/editor/contrib/codelens/codelens.ts",
-		"./vs/editor/contrib/codelens/codelensController.ts",
-		"./vs/editor/contrib/codelens/codelensWidget.ts",
-		"./vs/editor/contrib/colorPicker/color.ts",
-		"./vs/editor/contrib/colorPicker/colorDetector.ts",
-		"./vs/editor/contrib/colorPicker/colorPickerModel.ts",
-		"./vs/editor/contrib/colorPicker/colorPickerWidget.ts",
-		"./vs/editor/contrib/comment/blockCommentCommand.ts",
-		"./vs/editor/contrib/comment/comment.ts",
-		"./vs/editor/contrib/comment/lineCommentCommand.ts",
-		"./vs/editor/contrib/comment/test/blockCommentCommand.test.ts",
-		"./vs/editor/contrib/comment/test/lineCommentCommand.test.ts",
-		"./vs/editor/contrib/contextmenu/contextmenu.ts",
-		"./vs/editor/contrib/cursorUndo/cursorUndo.ts",
-		"./vs/editor/contrib/dnd/dnd.ts",
-		"./vs/editor/contrib/dnd/dragAndDropCommand.ts",
-		"./vs/editor/contrib/find/findController.ts",
-		"./vs/editor/contrib/find/findDecorations.ts",
-		"./vs/editor/contrib/find/findModel.ts",
-		"./vs/editor/contrib/find/findOptionsWidget.ts",
-		"./vs/editor/contrib/find/findState.ts",
-		"./vs/editor/contrib/find/findWidget.ts",
-		"./vs/editor/contrib/find/replaceAllCommand.ts",
-		"./vs/editor/contrib/find/replacePattern.ts",
-		"./vs/editor/contrib/find/simpleFindWidget.ts",
-		"./vs/editor/contrib/find/test/find.test.ts",
-		"./vs/editor/contrib/find/test/findController.test.ts",
-		"./vs/editor/contrib/find/test/findModel.test.ts",
-		"./vs/editor/contrib/find/test/replacePattern.test.ts",
-		"./vs/editor/contrib/folding/folding.ts",
-		"./vs/editor/contrib/folding/foldingDecorations.ts",
-		"./vs/editor/contrib/folding/foldingModel.ts",
-		"./vs/editor/contrib/folding/foldingRanges.ts",
-		"./vs/editor/contrib/folding/hiddenRangeModel.ts",
-		"./vs/editor/contrib/folding/indentRangeProvider.ts",
-		"./vs/editor/contrib/folding/intializingRangeProvider.ts",
-		"./vs/editor/contrib/folding/syntaxRangeProvider.ts",
-		"./vs/editor/contrib/folding/test/foldingModel.test.ts",
-		"./vs/editor/contrib/folding/test/foldingRanges.test.ts",
-		"./vs/editor/contrib/folding/test/hiddenRangeModel.test.ts",
-		"./vs/editor/contrib/folding/test/indentFold.test.ts",
-		"./vs/editor/contrib/folding/test/indentRangeProvider.test.ts",
-		"./vs/editor/contrib/folding/test/syntaxFold.test.ts",
-		"./vs/editor/contrib/fontZoom/fontZoom.ts",
-		"./vs/editor/contrib/goToDefinition/clickLinkGesture.ts",
-		"./vs/editor/contrib/goToDefinition/goToDefinition.ts",
-		"./vs/editor/contrib/hover/getHover.ts",
-		"./vs/editor/contrib/hover/hover.ts",
-		"./vs/editor/contrib/hover/hoverOperation.ts",
-		"./vs/editor/contrib/hover/hoverWidgets.ts",
-		"./vs/editor/contrib/hover/modesContentHover.ts",
-		"./vs/editor/contrib/hover/modesGlyphHover.ts",
-		"./vs/editor/contrib/indentation/indentUtils.ts",
-		"./vs/editor/contrib/indentation/indentation.ts",
-		"./vs/editor/contrib/indentation/test/indentation.test.ts",
-		"./vs/editor/contrib/linesOperations/copyLinesCommand.ts",
-		"./vs/editor/contrib/linesOperations/linesOperations.ts",
-		"./vs/editor/contrib/linesOperations/moveLinesCommand.ts",
-		"./vs/editor/contrib/linesOperations/sortLinesCommand.ts",
-		"./vs/editor/contrib/linesOperations/test/copyLinesCommand.test.ts",
-		"./vs/editor/contrib/linesOperations/test/linesOperations.test.ts",
-		"./vs/editor/contrib/linesOperations/test/moveLinesCommand.test.ts",
-		"./vs/editor/contrib/linesOperations/test/sortLinesCommand.test.ts",
-		"./vs/editor/contrib/links/getLinks.ts",
-		"./vs/editor/contrib/links/links.ts",
-		"./vs/editor/contrib/markdown/markdownRenderer.ts",
-		"./vs/editor/contrib/message/messageController.ts",
-		"./vs/editor/contrib/multicursor/multicursor.ts",
-		"./vs/editor/contrib/multicursor/test/multicursor.test.ts",
-		"./vs/editor/contrib/parameterHints/parameterHints.ts",
-		"./vs/editor/contrib/parameterHints/parameterHintsModel.ts",
-		"./vs/editor/contrib/parameterHints/parameterHintsWidget.ts",
-		"./vs/editor/contrib/parameterHints/provideSignatureHelp.ts",
-		"./vs/editor/contrib/parameterHints/test/parameterHintsModel.test.ts",
-		"./vs/editor/contrib/quickOpen/quickOpen.ts",
-		"./vs/editor/contrib/referenceSearch/peekViewWidget.ts",
-		"./vs/editor/contrib/referenceSearch/referencesModel.ts",
-		"./vs/editor/contrib/referenceSearch/referencesTree.ts",
-		"./vs/editor/contrib/referenceSearch/referencesWidget.ts",
-		"./vs/editor/contrib/referenceSearch/test/referencesModel.test.ts",
-		"./vs/editor/contrib/rename/rename.ts",
-		"./vs/editor/contrib/rename/renameInputField.ts",
-		"./vs/editor/contrib/suggest/test/suggestMemory.test.ts",
-		"./vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.ts",
-		"./vs/editor/contrib/tokenization/tokenization.ts",
-		"./vs/editor/contrib/wordHighlighter/wordHighlighter.ts",
-		"./vs/editor/contrib/wordOperations/test/wordOperations.test.ts",
-		"./vs/editor/contrib/wordOperations/test/wordTestUtils.ts",
-		"./vs/editor/contrib/wordOperations/wordOperations.ts",
-		"./vs/editor/contrib/wordPartOperations/test/wordPartOperations.test.ts",
-		"./vs/editor/contrib/wordPartOperations/wordPartOperations.ts",
-		"./vs/editor/contrib/zoneWidget/zoneWidget.ts",
-		"./vs/editor/editor.api.ts",
-		"./vs/editor/editor.worker.ts",
-		"./vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp.ts",
-		"./vs/editor/standalone/browser/colorizer.ts",
-		"./vs/editor/standalone/browser/iPadShowKeyboard/iPadShowKeyboard.ts",
-		"./vs/editor/standalone/browser/inspectTokens/inspectTokens.ts",
-		"./vs/editor/standalone/browser/quickOpen/editorQuickOpen.ts",
-		"./vs/editor/standalone/browser/quickOpen/gotoLine.ts",
-		"./vs/editor/standalone/browser/quickOpen/quickCommand.ts",
-		"./vs/editor/standalone/browser/quickOpen/quickOpenEditorWidget.ts",
-		"./vs/editor/standalone/browser/quickOpen/quickOutline.ts",
-		"./vs/editor/standalone/browser/simpleServices.ts",
-		"./vs/editor/standalone/browser/standaloneCodeEditor.ts",
-		"./vs/editor/standalone/browser/standaloneCodeServiceImpl.ts",
-		"./vs/editor/standalone/browser/standaloneEditor.ts",
-		"./vs/editor/standalone/browser/standaloneLanguages.ts",
-		"./vs/editor/standalone/browser/standaloneServices.ts",
-		"./vs/editor/standalone/browser/standaloneThemeServiceImpl.ts",
-		"./vs/editor/standalone/browser/toggleHighContrast/toggleHighContrast.ts",
-		"./vs/editor/standalone/common/monarch/monarchCommon.ts",
-		"./vs/editor/standalone/common/monarch/monarchCompile.ts",
-		"./vs/editor/standalone/common/monarch/monarchLexer.ts",
-		"./vs/editor/standalone/common/monarch/monarchTypes.ts",
-		"./vs/editor/standalone/common/standaloneThemeService.ts",
-		"./vs/editor/standalone/common/themes.ts",
-		"./vs/editor/standalone/test/browser/simpleServices.test.ts",
-		"./vs/editor/standalone/test/browser/standaloneLanguages.test.ts",
-		"./vs/editor/test/browser/controller/imeTester.ts",
-		"./vs/editor/test/browser/editorTestServices.ts",
-		"./vs/editor/test/browser/testCodeEditor.ts",
-		"./vs/editor/test/browser/testCommand.ts",
-		"./vs/editor/test/browser/view/minimapFontCreator.ts",
-		"./vs/editor/test/browser/view/viewLayer.test.ts",
-		"./vs/editor/test/common/commentMode.ts",
-		"./vs/editor/test/common/config/commonEditorConfig.test.ts",
-		"./vs/editor/test/common/controller/cursorMoveHelper.test.ts",
-		"./vs/editor/test/common/core/characterClassifier.test.ts",
-		"./vs/editor/test/common/core/lineTokens.test.ts",
-		"./vs/editor/test/common/core/range.test.ts",
-		"./vs/editor/test/common/core/viewLineToken.ts",
-		"./vs/editor/test/common/editorTestUtils.ts",
-		"./vs/editor/test/common/mocks/mockMode.ts",
-		"./vs/editor/test/common/mocks/testConfiguration.ts",
-		"./vs/editor/test/common/model/benchmark/benchmarkUtils.ts",
-		"./vs/editor/test/common/model/benchmark/entry.ts",
-		"./vs/editor/test/common/model/benchmark/modelbuilder.benchmark.ts",
-		"./vs/editor/test/common/model/benchmark/operations.benchmark.ts",
-		"./vs/editor/test/common/model/benchmark/searchNReplace.benchmark.ts",
-		"./vs/editor/test/common/model/editableTextModelAuto.test.ts",
-		"./vs/editor/test/common/model/editableTextModelTestUtils.ts",
-		"./vs/editor/test/common/model/linesTextBuffer/linesTextBufferBuilder.test.ts",
-		"./vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils.ts",
-		"./vs/editor/test/common/model/model.test.ts",
-		"./vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts",
-		"./vs/editor/test/common/modes/languageConfiguration.test.ts",
-		"./vs/editor/test/common/modes/supports/characterPair.test.ts",
-		"./vs/editor/test/common/modes/supports/javascriptOnEnterRules.ts",
-		"./vs/editor/test/common/modes/supports/tokenization.test.ts",
-		"./vs/editor/test/common/modesTestUtils.ts",
-		"./vs/editor/test/common/services/languagesRegistry.test.ts",
-		"./vs/editor/test/common/view/minimapCharRendererFactory.ts",
-		"./vs/editor/test/common/view/overviewZoneManager.test.ts",
-		"./vs/editor/test/common/viewLayout/editorLayoutProvider.test.ts",
-		"./vs/editor/test/common/viewLayout/lineDecorations.test.ts",
-		"./vs/editor/test/common/viewLayout/viewLineRenderer.test.ts",
-		"./vs/editor/test/common/viewLayout/whitespaceComputer.test.ts",
-		"./vs/editor/test/common/viewModel/characterHardWrappingLineMapper.test.ts",
-		"./vs/editor/test/common/viewModel/prefixSumComputer.test.ts",
-		"./vs/editor/test/common/viewModel/testViewModel.ts",
-		"./vs/editor/test/common/viewModel/viewModelDecorations.test.ts",
-		"./vs/editor/test/common/viewModel/viewModelImpl.test.ts",
 		"./vs/monaco.d.ts",
 		"./vs/nls.d.ts",
 		"./vs/nls.mock.ts",

Diff for: src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.ts

@@ -164,7 +164,7 @@ export class DefinitionAction extends EditorAction {
 
 	private _openInPeek(editorService: ICodeEditorService, target: ICodeEditor, model: ReferencesModel) {
 		let controller = ReferencesController.get(target);
-		if (controller) {
+		if (controller && target.hasModel()) {
 			controller.toggleWidget(target.getSelection(), createCancelablePromise(_ => Promise.resolve(model)), {
 				getMetaTitle: (model) => {
 					return this._getMetaTitle(model);

Diff for: src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.ts

@@ -293,7 +293,7 @@ class GotoDefinitionWithMouseEditorContribution implements editorCommon.IEditorC
 
 	private gotoDefinition(target: IMouseTarget, sideBySide: boolean): Promise<any> {
 		this.editor.setPosition(target.position!);
-		const action = new DefinitionAction(new DefinitionActionConfig(sideBySide, false, true, false), { alias: undefined, label: undefined, id: undefined, precondition: undefined });
+		const action = new DefinitionAction(new DefinitionActionConfig(sideBySide, false, true, false), { alias: '', label: '', id: '', precondition: null });
 		return this.editor.invokeWithinContext(accessor => action.run(accessor, this.editor));
 	}
 

Diff for: src/vs/editor/contrib/referenceSearch/referencesController.ts

@@ -33,8 +33,8 @@ export abstract class ReferencesController implements editorCommon.IEditorContri
 	private static readonly ID = 'editor.contrib.referencesController';
 
 	private _editor: ICodeEditor;
-	private _widget: ReferenceWidget;
-	private _model: ReferencesModel;
+	private _widget: ReferenceWidget | null;
+	private _model: ReferencesModel | null;
 	private _requestIdPool = 0;
 	private _disposables: IDisposable[] = [];
 	private _ignoreModelChangeEvent = false;
@@ -66,23 +66,26 @@ export abstract class ReferencesController implements editorCommon.IEditorContri
 	public dispose(): void {
 		this._referenceSearchVisible.reset();
 		dispose(this._disposables);
-		dispose(this._widget);
-		dispose(this._model);
-		this._widget = null;
-		this._model = null;
-		this._editor = null;
+		if (this._widget) {
+			dispose(this._widget);
+			this._widget = null;
+		}
+		if (this._model) {
+			dispose(this._model);
+			this._model = null;
+		}
 	}
 
 	public toggleWidget(range: Range, modelPromise: CancelablePromise<ReferencesModel>, options: RequestOptions): void {
 
 		// close current widget and return early is position didn't change
-		let widgetPosition: Position;
+		let widgetPosition: Position | undefined;
 		if (this._widget) {
 			widgetPosition = this._widget.position;
 		}
 		this.closeWidget();
 		if (!!widgetPosition && range.containsPosition(widgetPosition)) {
-			return null;
+			return;
 		}
 
 		this._referenceSearchVisible.set(true);
@@ -101,9 +104,10 @@ export abstract class ReferencesController implements editorCommon.IEditorContri
 		this._widget.show(range);
 		this._disposables.push(this._widget.onDidClose(() => {
 			modelPromise.cancel();
-
-			this._storageService.store(storageKey, JSON.stringify(this._widget.layoutData), StorageScope.GLOBAL);
-			this._widget = null;
+			if (this._widget) {
+				this._storageService.store(storageKey, JSON.stringify(this._widget.layoutData), StorageScope.GLOBAL);
+				this._widget = null;
+			}
 			this.closeWidget();
 		}));
 
@@ -119,13 +123,17 @@ export abstract class ReferencesController implements editorCommon.IEditorContri
 						break;
 					}
 				case 'side':
-					this.openReference(element, kind === 'side');
+					if (element) {
+						this.openReference(element, kind === 'side');
+					}
 					break;
 				case 'goto':
-					if (options.onGoto) {
-						options.onGoto(element);
-					} else {
-						this._gotoReference(element);
+					if (element) {
+						if (options.onGoto) {
+							options.onGoto(element);
+						} else {
+							this._gotoReference(element);
+						}
 					}
 					break;
 			}
@@ -148,7 +156,7 @@ export abstract class ReferencesController implements editorCommon.IEditorContri
 
 			// show widget
 			return this._widget.setModel(this._model).then(() => {
-				if (this._widget) { // might have been closed
+				if (this._widget && this._model && this._editor.hasModel()) { // might have been closed
 					// set title
 					this._widget.setMetaTitle(options.getMetaTitle(this._model));
 
@@ -169,31 +177,46 @@ export abstract class ReferencesController implements editorCommon.IEditorContri
 	}
 
 	public async goToNextOrPreviousReference(fwd: boolean) {
-		if (this._model) { // can be called while still resolving...
-			let source = this._model.nearestReference(this._editor.getModel().uri, this._widget.position);
-			let target = this._model.nextOrPreviousReference(source, fwd);
-			let editorFocus = this._editor.hasTextFocus();
-			await this._widget.setSelection(target);
-			await this._gotoReference(target);
-			if (editorFocus) {
-				this._editor.focus();
-			}
+		if (!this._editor.hasModel() || !this._model || !this._widget) {
+			// can be called while still resolving...
+			return;
+		}
+		const currentPosition = this._widget.position;
+		if (!currentPosition) {
+			return;
+		}
+		const source = this._model.nearestReference(this._editor.getModel().uri, currentPosition);
+		if (!source) {
+			return;
+		}
+		const target = this._model.nextOrPreviousReference(source, fwd);
+		const editorFocus = this._editor.hasTextFocus();
+		await this._widget.setSelection(target);
+		await this._gotoReference(target);
+		if (editorFocus) {
+			this._editor.focus();
 		}
 	}
 
 	public closeWidget(): void {
-		dispose(this._widget);
-		this._widget = null;
+		if (this._widget) {
+			dispose(this._widget);
+			this._widget = null;
+		}
 		this._referenceSearchVisible.reset();
 		this._disposables = dispose(this._disposables);
-		dispose(this._model);
-		this._model = null;
+		if (this._model) {
+			dispose(this._model);
+			this._model = null;
+		}
 		this._editor.focus();
 		this._requestIdPool += 1; // Cancel pending requests
 	}
 
 	private _gotoReference(ref: Location): Promise<any> {
-		this._widget.hide();
+		if (this._widget) {
+			this._widget.hide();
+		}
 
 		this._ignoreModelChangeEvent = true;
 		const range = Range.lift(ref.range).collapseToStart();
@@ -216,8 +239,10 @@ export abstract class ReferencesController implements editorCommon.IEditorContri
 				return;
 			}
 
-			this._widget.show(range);
-			this._widget.focus();
+			if (this._widget) {
+				this._widget.show(range);
+				this._widget.focus();
+			}
 
 		}, (err) => {
 			this._ignoreModelChangeEvent = false;

Diff for: src/vs/editor/contrib/referenceSearch/referencesWidget.ts

@@ -461,14 +461,14 @@ export class ReferenceWidget extends PeekViewWidget {
 		});
 	}
 
-	public setModel(newModel: ReferencesModel | undefined): Promise<any> | undefined {
+	public setModel(newModel: ReferencesModel | undefined): Promise<any> {
 		// clean up
 		this._disposeOnNewModel = dispose(this._disposeOnNewModel);
 		this._model = newModel;
 		if (this._model) {
 			return this._onNewModel();
 		}
-		return undefined;
+		return Promise.resolve();
 	}
 
 	private _onNewModel(): Promise<any> {