development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 13:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use correct context key service in code action widget (#162478)

Browse source 
Fixes #162477

This fixes a bug where the code action widget could get stuck using the wrong context key service
This commit is contained in:
Matt Bierner 2022-09-30 18:52:06 -07:00 committed by GitHub
parent 64c7d125c7
commit 61f8dee571
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/vs/editor/contrib/codeAction/browser/codeActionUi.ts
View file

@ -15,6 +15,7 @@ import { CodeActionTriggerType } from 'vs/editor/common/languages';
import { CodeActionItem, CodeActionSet } from 'vs/editor/contrib/codeAction/browser/codeAction';
import { MessageController } from 'vs/editor/contrib/message/browser/messageController';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { CodeActionsState } from './codeActionModel';
import { CodeActionShowOptions, CodeActionWidget } from './codeActionWidget';
@ -34,8 +35,9 @@ export class CodeActionUi extends Disposable {
private readonly delegate: {
applyCodeAction: (action: CodeActionItem, regtriggerAfterApply: boolean, preview: boolean) => Promise<void>;
},
@IInstantiationService private readonly _instantiationService: IInstantiationService,
@IConfigurationService private readonly _configurationService: IConfigurationService,
@IContextKeyService private readonly _contextKeyService: IContextKeyService,
@IInstantiationService private readonly _instantiationService: IInstantiationService,
) {
super();
@ -166,7 +168,7 @@ export class CodeActionUi extends Disposable {
onHide: () => {
this._editor?.focus();
},
});
}, this._contextKeyService);
}
private toCoords(position: IPosition): IAnchor {

30
src/vs/editor/contrib/codeAction/browser/codeActionWidget.ts
View file

@ -20,7 +20,7 @@ import { CodeActionKind, CodeActionTrigger, CodeActionTriggerSource } from 'vs/e
import 'vs/editor/contrib/symbolIcons/browser/symbolIcons'; // The codicon symbol colors are defined here and must be loaded to get colors
import { localize } from 'vs/nls';
import { ICommandService } from 'vs/platform/commands/common/commands';
import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
import { IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
@ -369,40 +369,44 @@ export class CodeActionWidget extends Disposable {
readonly container: HTMLElement | undefined;
readonly codeActions: CodeActionSet;
readonly delegate: CodeActionWidgetDelegate;
readonly contextKeyService: IContextKeyService;
};
private readonly _ctxMenuWidgetVisible: IContextKey<boolean>;
constructor(
@ICommandService private readonly _commandService: ICommandService,
@IContextKeyService private readonly _contextKeyService: IContextKeyService,
@IContextViewService private readonly _contextViewService: IContextViewService,
@IKeybindingService private readonly _keybindingService: IKeybindingService,
@ITelemetryService private readonly _telemetryService: ITelemetryService,
) {
super();
this._ctxMenuWidgetVisible = Context.Visible.bindTo(this._contextKeyService);
}
get isVisible(): boolean {
return !!this.currentShowingContext;
}
public async show(trigger: CodeActionTrigger, codeActions: CodeActionSet, anchor: IAnchor, container: HTMLElement | undefined, options: CodeActionShowOptions, delegate: CodeActionWidgetDelegate): Promise<void> {
public async show(trigger: CodeActionTrigger, codeActions: CodeActionSet, anchor: IAnchor, container: HTMLElement | undefined, options: CodeActionShowOptions, delegate: CodeActionWidgetDelegate, contextKeyService: IContextKeyService): Promise<void> {
this.currentShowingContext = undefined;
const visibleContext = Context.Visible.bindTo(contextKeyService);
const actionsToShow = options.includeDisabledActions && (showDisabled || codeActions.validActions.length === 0) ? codeActions.allActions : codeActions.validActions;
if (!actionsToShow.length) {
visibleContext.reset();
return;
}
this.currentShowingContext = { trigger, codeActions, anchor, container, delegate, options };
this.currentShowingContext = { trigger, codeActions, anchor, container, delegate, options, contextKeyService };
this._contextViewService.showContextView({
getAnchor: () => anchor,
render: (container: HTMLElement) => this.renderWidget(container, trigger, codeActions, options, actionsToShow, delegate),
onHide: (didCancel: boolean) => this.onWidgetClosed(trigger, options, codeActions, didCancel, delegate),
render: (container: HTMLElement) => {
visibleContext.set(true);
return this.renderWidget(container, trigger, codeActions, options, actionsToShow, delegate);
},
onHide: (didCancel: boolean) => {
visibleContext.reset();
return this.onWidgetClosed(trigger, options, codeActions, didCancel, delegate);
},
}, container, false);
}
@ -487,8 +491,6 @@ export class CodeActionWidget extends Disposable {
const focusTracker = renderDisposables.add(dom.trackFocus(element));
renderDisposables.add(focusTracker.onDidBlur(() => this.hide()));
this._ctxMenuWidgetVisible.set(true);
return renderDisposables;
}
@ -503,7 +505,7 @@ export class CodeActionWidget extends Disposable {
showDisabled = newShowDisabled;
if (previousCtx) {
this.show(previousCtx.trigger, previousCtx.codeActions, previousCtx.anchor, previousCtx.container, previousCtx.options, previousCtx.delegate);
this.show(previousCtx.trigger, previousCtx.codeActions, previousCtx.anchor, previousCtx.container, previousCtx.options, previousCtx.delegate, previousCtx.contextKeyService);
}
}
@ -529,7 +531,7 @@ export class CodeActionWidget extends Disposable {
});
this.currentShowingContext = undefined;
this._ctxMenuWidgetVisible.reset();
delegate.onHide(cancelled);
}