Merge commit 'refs/pull/74239/head' of github.com:Microsoft/vscode into pr/74239

joaomoreno · joaomoreno · commit 228cf76a2ab7 · 2019-05-29T11:05:37.000+02:00
diff --git a/src/vs/base/browser/ui/contextview/contextview.ts b/src/vs/base/browser/ui/contextview/contextview.ts
@@ -260,12 +260,13 @@ export class ContextView extends Disposable {
 	}
 
 	hide(data?: any): void {
-		if (this.delegate && this.delegate.onHide) {
-			this.delegate.onHide(data);
-		}
-
+		const delegate = this.delegate;
 		this.delegate = null;
 
+		if (delegate && delegate.onHide) {
+			delegate.onHide(data);
+		}
+
 		if (this.toDisposeOnClean) {
 			this.toDisposeOnClean.dispose();
 			this.toDisposeOnClean = null;
diff --git a/src/vs/base/browser/ui/inputbox/inputBox.ts b/src/vs/base/browser/ui/inputbox/inputBox.ts
@@ -93,7 +93,7 @@ export class InputBox extends Widget {
 	private placeholder: string;
 	private ariaLabel: string;
 	private validation?: IInputValidator;
-	private state: string | null = 'idle';
+	private state: 'idle' | 'open' | 'closed' | null = 'idle';
 	private cachedHeight: number | null;
 
 	private inputBackground?: Color;
@@ -421,18 +421,23 @@ export class InputBox extends Widget {
 
 				return null;
 			},
+			onHide: () => {
+				this.state = 'closed';
+			},
 			layout: layout
 		});
 	}
 
 	private _hideMessage(): void {
-		if (!this.contextViewProvider || this.state !== 'open') {
+		if (!this.contextViewProvider) {
 			return;
 		}
 
-		this.state = 'idle';
+		if (this.state === 'open') {
+			this.contextViewProvider.hideContextView();
+		}
 
-		this.contextViewProvider.hideContextView();
+		this.state = 'idle';
 	}
 
 	private onValueChange(): void {
