From 2dfdd52a09b4dbf24366f816cd5f8768f8aef609 Mon Sep 17 00:00:00 2001
From: Ramya Achutha Rao <ramyar@microsoft.com>
Date: Thu, 18 May 2017 15:53:55 -0700
Subject: [PATCH] Remove flicker when docs are expanded below

---
 .../contrib/suggest/browser/suggestWidget.ts  | 39 ++++++++-----------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/src/vs/editor/contrib/suggest/browser/suggestWidget.ts b/src/vs/editor/contrib/suggest/browser/suggestWidget.ts
index 4216f33f89d..a572d9beb4b 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestWidget.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestWidget.ts
@@ -611,6 +611,7 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 				show(this.listElement);
 				if (this.storageService.getBoolean('expandSuggestionDocs', StorageScope.GLOBAL, false)) {
 					show(this.details.element);
+					this.expandSideOrBelow();
 				} else {
 					hide(this.details.element);
 				}
@@ -809,9 +810,13 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 			this.storageService.store('expandSuggestionDocs', false, StorageScope.GLOBAL);
 			hide(this.details.element);
 			removeClass(this.element, 'docs-side');
+			removeClass(this.element, 'docs-below');
 			this.editor.layoutContentWidget(this);
 		} else {
 			this.storageService.store('expandSuggestionDocs', true, StorageScope.GLOBAL);
+
+			this.expandSideOrBelow();
+
 			this.showDetails();
 		}
 	}
@@ -822,7 +827,6 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 		}
 
 		show(this.details.element);
-		addClass(this.element, 'docs-side');
 
 		this.show();
 		this.editor.focus();
@@ -891,32 +895,12 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 		this.listElement.style.height = `${height}px`;
 		this.list.layout(height);
 
-		this.adjustWidgetWidth();
+		this.listElement.style.marginTop = '0px';
 		this.editor.layoutContentWidget(this);
 
 		return height;
 	}
 
-	private adjustWidgetWidth() {
-
-		// Message element is shown, list and docs are not
-		if (this.messageElement.style.display !== 'none'
-			&& this.details.element.style.display === 'none'
-			&& this.listElement.style.display === 'none') {
-
-			return;
-		}
-
-		let matches = this.element.style.maxWidth.match(/(\d+)px/);
-		if (!matches || Number(matches[1]) >= this.maxWidgetWidth) {
-			// Reset width
-			removeClass(this.element, 'small');
-		}
-
-		// Reset list margin
-		this.listElement.style.marginTop = '0px';
-	}
-
 	private adjustDocsPosition() {
 		const cursorCoords = this.editor.getScrolledVisiblePosition(this.editor.getPosition());
 		const editorCoords = getDomNodePagePosition(this.editor.getDomNode());
@@ -945,6 +929,17 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 		}
 	}
 
+	private expandSideOrBelow() {
+		let matches = this.element.style.maxWidth.match(/(\d+)px/);
+		if (!matches || Number(matches[1]) < this.maxWidgetWidth) {
+			addClass(this.element, 'docs-below');
+			removeClass(this.element, 'docs-side');
+		} else {
+			addClass(this.element, 'docs-side');
+			removeClass(this.element, 'docs-below');
+		}
+	}
+
 	private renderDetails(): void {
 		if (this.state === State.Details || this.state === State.Open) {
 			this.details.render(this.list.getFocusedElements()[0]);