From b0e93a987b8a3f963ce4b107b3d3277ea367ef2e Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Thu, 26 Aug 2021 13:06:20 +0200 Subject: [PATCH] simplify "Go to Symbol in Editor" registration, fyi @bpasero, related to https://github.com/microsoft/vscode/issues/129189 --- .../browser/quickaccess/gotoSymbolQuickAccess.ts | 8 +++++++- .../quickaccess/browser/quickAccess.contribution.ts | 9 --------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts b/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts index d544cabbb2d..e23dd2a39d3 100644 --- a/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts +++ b/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts @@ -17,7 +17,7 @@ import { ITextModel } from 'vs/editor/common/model'; import { DisposableStore, IDisposable, toDisposable, Disposable, MutableDisposable } from 'vs/base/common/lifecycle'; import { timeout } from 'vs/base/common/async'; import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation'; -import { registerAction2, Action2 } from 'vs/platform/actions/common/actions'; +import { registerAction2, Action2, MenuId } from 'vs/platform/actions/common/actions'; import { KeyMod, KeyCode } from 'vs/base/common/keyCodes'; import { prepareQuery } from 'vs/base/common/fuzzyScorer'; import { SymbolKind } from 'vs/editor/common/modes'; @@ -255,6 +255,7 @@ registerAction2(class GotoSymbolAction extends Action2 { id: 'workbench.action.gotoSymbol', title: { value: localize('gotoSymbol', "Go to Symbol in Editor..."), + mnemonicTitle: localize({ key: 'miGotoSymbolInEditor', comment: ['&& denotes a mnemonic'] }, "Go to &&Symbol in Editor..."), original: 'Go to Symbol in Editor...' }, f1: true, @@ -262,6 +263,11 @@ registerAction2(class GotoSymbolAction extends Action2 { when: undefined, weight: KeybindingWeight.WorkbenchContrib, primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_O + }, + menu: { + id: MenuId.MenubarGoMenu, + group: '4_symbol_nav', + order: 1 } }); } diff --git a/src/vs/workbench/contrib/quickaccess/browser/quickAccess.contribution.ts b/src/vs/workbench/contrib/quickaccess/browser/quickAccess.contribution.ts index 895c3df7b10..d6a175b43cd 100644 --- a/src/vs/workbench/contrib/quickaccess/browser/quickAccess.contribution.ts +++ b/src/vs/workbench/contrib/quickaccess/browser/quickAccess.contribution.ts @@ -66,15 +66,6 @@ MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, { order: 2 }); -MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, { - group: '4_symbol_nav', - command: { - id: 'workbench.action.gotoSymbol', - title: localize({ key: 'miGotoSymbolInEditor', comment: ['&& denotes a mnemonic'] }, "Go to &&Symbol in Editor...") - }, - order: 1 -}); - MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, { group: '5_infile_nav', command: {