From 99ffa6afcf86c9ca3dc618570f383a236efaaa2e Mon Sep 17 00:00:00 2001 From: Ramya Achutha Rao Date: Mon, 26 Jun 2017 10:14:25 -0700 Subject: [PATCH] Move state check ahead to ensure stale docs are not made visible #29468 --- .../contrib/suggest/browser/suggestWidget.ts | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/vs/editor/contrib/suggest/browser/suggestWidget.ts b/src/vs/editor/contrib/suggest/browser/suggestWidget.ts index 6577a037c6a..3816c0e6420 100644 --- a/src/vs/editor/contrib/suggest/browser/suggestWidget.ts +++ b/src/vs/editor/contrib/suggest/browser/suggestWidget.ts @@ -850,6 +850,10 @@ export class SuggestWidget implements IContentWidget, IDelegate this.editor.layoutContentWidget(this); this.telemetryService.publicLog('suggestWidget:collapseDetails', this.editor.getTelemetryData()); } else { + if (this.state !== State.Open && this.state !== State.Details) { + return; + } + this.updateExpandDocsSetting(true); this.showDetails(); this.telemetryService.publicLog('suggestWidget:expandDetails', this.editor.getTelemetryData()); @@ -858,13 +862,10 @@ export class SuggestWidget implements IContentWidget, IDelegate } showDetails(): void { - if (this.state !== State.Open && this.state !== State.Details) { - return; - } this.expandSideOrBelow(); show(this.details.element); - this.renderDetails(); + this.details.render(this.list.getFocusedElements()[0]); this.details.element.style.maxHeight = this.maxWidgetHeight + 'px'; // Reset margin-top that was set as Fix for #26416 @@ -980,14 +981,6 @@ export class SuggestWidget implements IContentWidget, IDelegate } } - private renderDetails(): void { - if (this.state === State.Details || this.state === State.Open) { - this.details.render(this.list.getFocusedElements()[0]); - } else { - this.details.render(null); - } - } - // Heights private get maxWidgetHeight(): number {