Skip to content

Commit 99ffa6a

Browse files
committed
Move state check ahead to ensure stale docs are not made visible microsoft#29468
1 parent 8ace8ef commit 99ffa6a

1 file changed

Lines changed: 5 additions & 12 deletions

File tree

src/vs/editor/contrib/suggest/browser/suggestWidget.ts

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -850,6 +850,10 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
850850
this.editor.layoutContentWidget(this);
851851
this.telemetryService.publicLog('suggestWidget:collapseDetails', this.editor.getTelemetryData());
852852
} else {
853+
if (this.state !== State.Open && this.state !== State.Details) {
854+
return;
855+
}
856+
853857
this.updateExpandDocsSetting(true);
854858
this.showDetails();
855859
this.telemetryService.publicLog('suggestWidget:expandDetails', this.editor.getTelemetryData());
@@ -858,13 +862,10 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
858862
}
859863

860864
showDetails(): void {
861-
if (this.state !== State.Open && this.state !== State.Details) {
862-
return;
863-
}
864865
this.expandSideOrBelow();
865866

866867
show(this.details.element);
867-
this.renderDetails();
868+
this.details.render(this.list.getFocusedElements()[0]);
868869
this.details.element.style.maxHeight = this.maxWidgetHeight + 'px';
869870

870871
// Reset margin-top that was set as Fix for #26416
@@ -980,14 +981,6 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
980981
}
981982
}
982983

983-
private renderDetails(): void {
984-
if (this.state === State.Details || this.state === State.Open) {
985-
this.details.render(this.list.getFocusedElements()[0]);
986-
} else {
987-
this.details.render(null);
988-
}
989-
}
990-
991984
// Heights
992985

993986
private get maxWidgetHeight(): number {

0 commit comments

Comments
 (0)