Skip to content

Commit 1040fc0

Browse files
authored
Align code action command ids with suggest widget (microsoft#159349) (microsoft#159475)
* Align code action command ids with suggest widget Fixes microsoft#159348 * Previous -> Prev
1 parent 16faaf4 commit 1040fc0

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

src/vs/editor/contrib/codeAction/browser/codeActionCommands.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
3232
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
3333
import { CodeActionModel, CodeActionsState, SUPPORTED_CODE_ACTIONS } from './codeActionModel';
3434
import { CodeActionAutoApply, CodeActionCommandArgs, CodeActionFilter, CodeActionKind, CodeActionTrigger, CodeActionTriggerSource } from './types';
35-
import { Context } from 'vs/editor/contrib/codeAction/browser/codeActionMenu';
35+
import { acceptSelectedCodeActionCommand, Context, previewSelectedCodeActionCommand } from 'vs/editor/contrib/codeAction/browser/codeActionMenu';
3636

3737
function contextKeyForSupportedActions(kind: CodeActionKind) {
3838
return ContextKeyExpr.regex(
@@ -522,7 +522,7 @@ const CodeActionContribution = EditorCommand.bindToContribution<QuickFixControll
522522
const weight = KeybindingWeight.EditorContrib + 90;
523523

524524
registerEditorCommand(new CodeActionContribution({
525-
id: 'hideCodeActionMenuWidget',
525+
id: 'hideCodeActionWidget',
526526
precondition: Context.Visible,
527527
handler(x) {
528528
x.hideCodeActionMenu();
@@ -535,7 +535,7 @@ registerEditorCommand(new CodeActionContribution({
535535
}));
536536

537537
registerEditorCommand(new CodeActionContribution({
538-
id: 'focusPreviousCodeAction',
538+
id: 'selectPrevCodeAction',
539539
precondition: Context.Visible,
540540
handler(x) {
541541
x.navigateCodeActionList(true);
@@ -548,7 +548,7 @@ registerEditorCommand(new CodeActionContribution({
548548
}));
549549

550550
registerEditorCommand(new CodeActionContribution({
551-
id: 'focusNextCodeAction',
551+
id: 'selectNextCodeAction',
552552
precondition: Context.Visible,
553553
handler(x) {
554554
x.navigateCodeActionList(false);
@@ -561,7 +561,7 @@ registerEditorCommand(new CodeActionContribution({
561561
}));
562562

563563
registerEditorCommand(new CodeActionContribution({
564-
id: 'onEnterSelectCodeAction',
564+
id: acceptSelectedCodeActionCommand,
565565
precondition: Context.Visible,
566566
handler(x) {
567567
x.selectedOption();
@@ -574,7 +574,7 @@ registerEditorCommand(new CodeActionContribution({
574574
}));
575575

576576
registerEditorCommand(new CodeActionContribution({
577-
id: 'onEnterSelectCodeActionWithPreview',
577+
id: previewSelectedCodeActionCommand,
578578
precondition: Context.Visible,
579579
handler(x) {
580580
x.selectedOptionWithPreview();

src/vs/editor/contrib/codeAction/browser/codeActionMenu.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ export const Context = {
3939
Visible: new RawContextKey<boolean>('codeActionMenuVisible', false, localize('codeActionMenuVisible', "Whether the code action list widget is visible"))
4040
};
4141

42+
export const acceptSelectedCodeActionCommand = 'acceptSelectedCodeAction';
43+
export const previewSelectedCodeActionCommand = 'previewSelectedCodeAction';
44+
4245
interface CodeActionWidgetDelegate {
4346
onSelectCodeAction: (action: CodeActionItem, trigger: CodeActionTrigger) => Promise<any>;
4447
}
@@ -288,7 +291,7 @@ export class CodeActionMenu extends Disposable implements IEditorContribution {
288291
});
289292

290293
this._ctxMenuWidgetVisible = Context.Visible.bindTo(this._contextKeyService);
291-
this.listRenderer = new CodeMenuRenderer([`onEnterSelectCodeAction`, `onEnterSelectCodeActionWithPreview`], keybindingService);
294+
this.listRenderer = new CodeMenuRenderer([acceptSelectedCodeActionCommand, previewSelectedCodeActionCommand], keybindingService);
292295
}
293296

294297
get isVisible(): boolean {

0 commit comments

Comments
 (0)