Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use correct context key service in code action widget #162479

Merged
merged 1 commit into from Oct 3, 2022
Merged

Use correct context key service in code action widget #162479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/vs/editor/contrib/codeAction/browser/codeActionUi.ts
View file
Open in desktop
Expand Up @@ -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';
Expand All @@ -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();

Expand Down Expand Up @@ -166,7 +168,7 @@ export class CodeActionUi extends Disposable {
onHide: () => {
this._editor?.focus();
},
});
}, this._contextKeyService);
}

private toCoords(position: IPosition): IAnchor {
Expand Down
30 changes: 16 additions & 14 deletions src/vs/editor/contrib/codeAction/browser/codeActionWidget.ts
View file
Open in desktop
Expand Up @@ -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';
Expand Down Expand Up @@ -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);
}

Expand Down Expand Up @@ -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;
}

Expand All @@ -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);
}
}

Expand All @@ -529,7 +531,7 @@ export class CodeActionWidget extends Disposable {
});

this.currentShowingContext = undefined;
this._ctxMenuWidgetVisible.reset();

delegate.onHide(cancelled);
}

Expand Down