Re microsoft#78168 Hover, codeAction

rebornix · rebornix · commit 4bc97d7fb34f · 2019-08-06T16:39:37.000-07:00
diff --git a/src/vs/editor/contrib/codeAction/test/codeAction.test.ts b/src/vs/editor/contrib/codeAction/test/codeAction.test.ts
@@ -59,8 +59,8 @@ suite('CodeAction', () => {
 		command: {
 			abc: {
 				command: new class implements modes.Command {
-					id: '1';
-					title: 'abc';
+					id!: '1';
+					title!: 'abc';
 				},
 				title: 'Extract to inner function in function "test"'
 			}
@@ -69,7 +69,7 @@ suite('CodeAction', () => {
 			bcd: {
 				diagnostics: <IMarkerData[]>[],
 				edit: new class implements modes.WorkspaceEdit {
-					edits: modes.ResourceTextEdit[];
+					edits!: modes.ResourceTextEdit[];
 				},
 				title: 'abc'
 			}
diff --git a/src/vs/editor/contrib/hover/hover.ts b/src/vs/editor/contrib/hover/hover.ts
@@ -34,27 +34,27 @@ export class ModesHoverController implements IEditorContribution {
 	private readonly _toUnhook = new DisposableStore();
 	private readonly _didChangeConfigurationHandler: IDisposable;
 
-	private _contentWidget: ModesContentHoverWidget;
-	private _glyphWidget: ModesGlyphHoverWidget;
+	private _contentWidget: ModesContentHoverWidget | null;
+	private _glyphWidget: ModesGlyphHoverWidget | null;
 
 	get contentWidget(): ModesContentHoverWidget {
 		if (!this._contentWidget) {
 			this._createHoverWidget();
 		}
-		return this._contentWidget;
+		return this._contentWidget!;
 	}
 
 	get glyphWidget(): ModesGlyphHoverWidget {
 		if (!this._glyphWidget) {
 			this._createHoverWidget();
 		}
-		return this._glyphWidget;
+		return this._glyphWidget!;
 	}
 
 	private _isMouseDown: boolean;
 	private _hoverClicked: boolean;
-	private _isHoverEnabled: boolean;
-	private _isHoverSticky: boolean;
+	private _isHoverEnabled!: boolean;
+	private _isHoverSticky!: boolean;
 
 	static get(editor: ICodeEditor): ModesHoverController {
 		return editor.getContribution<ModesHoverController>(ModesHoverController.ID);
@@ -69,6 +69,8 @@ export class ModesHoverController implements IEditorContribution {
 	) {
 		this._isMouseDown = false;
 		this._hoverClicked = false;
+		this._contentWidget = null;
+		this._glyphWidget = null;
 
 		this._hookEvents();
 
@@ -200,7 +202,7 @@ export class ModesHoverController implements IEditorContribution {
 			return;
 		}
 
-		this._glyphWidget.hide();
+		this._glyphWidget!.hide();
 		this._contentWidget.hide();
 	}
 
diff --git a/src/vs/editor/contrib/hover/hoverWidgets.ts b/src/vs/editor/contrib/hover/hoverWidgets.ts
@@ -42,6 +42,7 @@ export class ContentHoverWidget extends Widget implements editorBrowser.IContent
 		this._id = id;
 		this._editor = editor;
 		this._isVisible = false;
+		this._stoleFocus = false;
 
 		this._containerDomNode = document.createElement('div');
 		this._containerDomNode.className = 'monaco-editor-hover hidden';
diff --git a/src/vs/editor/contrib/hover/modesContentHover.ts b/src/vs/editor/contrib/hover/modesContentHover.ts
@@ -214,6 +214,8 @@ export class ModesContentHoverWidget extends ContentHoverWidget {
 		this._computer = new ModesContentComputer(this._editor, markerDecorationsService);
 		this._highlightDecorations = [];
 		this._isChangingDecorations = false;
+		this._shouldFocus = false;
+		this._colorPicker = null;
 
 		this._hoverOperation = new HoverOperation(
 			this._computer,
