Skip to content

Commit dde818e

Browse files
authored
1 parent 8285943 commit dde818e

File tree

3 files changed

+13
-1
lines changed

3 files changed

+13
-1
lines changed

src/vs/editor/contrib/hover/browser/hover.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import { HoverParticipantRegistry } from 'vs/editor/contrib/hover/browser/hoverT
2929
import { MarkdownHoverParticipant } from 'vs/editor/contrib/hover/browser/markdownHoverParticipant';
3030
import { MarkerHoverParticipant } from 'vs/editor/contrib/hover/browser/markerHoverParticipant';
3131
import 'vs/css!./hover';
32+
import { InlineSuggestionHintsContentWidget } from 'vs/editor/contrib/inlineCompletions/browser/inlineSuggestionHintsWidget';
3233

3334
export class ModesHoverController implements IEditorContribution {
3435

@@ -205,7 +206,7 @@ export class ModesHoverController implements IEditorContribution {
205206
}
206207

207208
private _hideWidgets(): void {
208-
if ((this._isMouseDown && this._hoverClicked && this._contentWidget?.isColorPickerVisible())) {
209+
if ((this._isMouseDown && this._hoverClicked && this._contentWidget?.isColorPickerVisible()) || InlineSuggestionHintsContentWidget.dropDownVisible) {
209210
return;
210211
}
211212

src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import { inlineSuggestCommitId } from 'vs/editor/contrib/inlineCompletions/brows
2828
import { BaseGhostTextWidgetModel, GhostText, GhostTextReplacement, GhostTextWidgetModel } from 'vs/editor/contrib/inlineCompletions/browser/ghostText';
2929
import { SharedInlineCompletionCache } from 'vs/editor/contrib/inlineCompletions/browser/ghostTextModel';
3030
import { inlineCompletionToGhostText, NormalizedInlineCompletion } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionToGhostText';
31+
import { InlineSuggestionHintsContentWidget } from 'vs/editor/contrib/inlineCompletions/browser/inlineSuggestionHintsWidget';
3132
import { getReadonlyEmptyArray } from 'vs/editor/contrib/inlineCompletions/browser/utils';
3233
import { SnippetController2 } from 'vs/editor/contrib/snippet/browser/snippetController2';
3334
import { SnippetParser, Text } from 'vs/editor/contrib/snippet/browser/snippetParser';
@@ -104,6 +105,9 @@ export class InlineCompletionsModel extends Disposable implements GhostTextWidge
104105
if (configurationService.getValue('editor.inlineSuggest.hideOnBlur')) {
105106
return;
106107
}
108+
if (InlineSuggestionHintsContentWidget.dropDownVisible) {
109+
return;
110+
}
107111
this.hide();
108112
})
109113
);

src/vs/editor/contrib/inlineCompletions/browser/inlineSuggestionHintsWidget.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,9 @@ const inlineSuggestionHintsNextIcon = registerIcon('inline-suggestion-hints-next
9090
const inlineSuggestionHintsPreviousIcon = registerIcon('inline-suggestion-hints-previous', Codicon.chevronLeft, localize('parameterHintsPreviousIcon', 'Icon for show previous parameter hint.'));
9191

9292
export class InlineSuggestionHintsContentWidget extends Disposable implements IContentWidget {
93+
private static _dropDownVisible = false;
94+
public static get dropDownVisible() { return this._dropDownVisible; }
95+
9396
private static id = 0;
9497

9598
private readonly id = `InlineSuggestionHintsContentWidget${InlineSuggestionHintsContentWidget.id++}`;
@@ -165,6 +168,10 @@ export class InlineSuggestionHintsContentWidget extends Disposable implements IC
165168
return action instanceof MenuItemAction ? instantiationService.createInstance(StatusBarViewItem, action, undefined) : undefined;
166169
},
167170
}));
171+
172+
this._register(this.toolBar.onDidChangeDropdownVisibility(e => {
173+
InlineSuggestionHintsContentWidget._dropDownVisible = e;
174+
}));
168175
}
169176

170177
public update(position: Position | null, currentSuggestionIdx: number, suggestionCount: number | undefined, extraCommands: Command[]): void {

0 commit comments

Comments
 (0)