diff --git a/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.ts b/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.ts index 6d1af21d7f..c463125622 100644 --- a/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.ts +++ b/src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.ts @@ -21,7 +21,7 @@ import { PeekContext } from 'vs/editor/contrib/referenceSearch/peekViewWidget'; import { ReferencesController } from 'vs/editor/contrib/referenceSearch/referencesController'; import { ReferencesModel } from 'vs/editor/contrib/referenceSearch/referencesModel'; import * as nls from 'vs/nls'; -// import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions'; +import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions'; import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry'; import { INotificationService } from 'vs/platform/notification/common/notification'; @@ -477,31 +477,29 @@ registerEditorAction(GoToTypeDefinitionAction); registerEditorAction(PeekTypeDefinitionAction); // Go to menu -// {{SQL CARBON EDIT}} - Disable unused menu items -// MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, { -// group: '4_symbol_nav', -// command: { -// id: 'editor.action.goToDeclaration', -// title: nls.localize({ key: 'miGotoDefinition', comment: ['&& denotes a mnemonic'] }, "Go to &&Definition") -// }, -// order: 2 -// }); +MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, { + group: '4_symbol_nav', + command: { + id: 'editor.action.goToDeclaration', + title: nls.localize({ key: 'miGotoDefinition', comment: ['&& denotes a mnemonic'] }, "Go to &&Definition") + }, + order: 2 +}); -// MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, { -// group: '4_symbol_nav', -// command: { -// id: 'editor.action.goToTypeDefinition', -// title: nls.localize({ key: 'miGotoTypeDefinition', comment: ['&& denotes a mnemonic'] }, "Go to &&Type Definition") -// }, -// order: 3 -// }); +MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, { + group: '4_symbol_nav', + command: { + id: 'editor.action.goToTypeDefinition', + title: nls.localize({ key: 'miGotoTypeDefinition', comment: ['&& denotes a mnemonic'] }, "Go to &&Type Definition") + }, + order: 3 +}); -// MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, { -// group: '4_symbol_nav', -// command: { -// id: 'editor.action.goToImplementation', -// title: nls.localize({ key: 'miGotoImplementation', comment: ['&& denotes a mnemonic'] }, "Go to &&Implementation") -// }, -// order: 4 -// }); -// {{SQL CARBON EDIT - End}} +MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, { + group: '4_symbol_nav', + command: { + id: 'editor.action.goToImplementation', + title: nls.localize({ key: 'miGotoImplementation', comment: ['&& denotes a mnemonic'] }, "Go to &&Implementation") + }, + order: 4 +}); diff --git a/src/vs/workbench/contrib/quickopen/browser/quickopen.contribution.ts b/src/vs/workbench/contrib/quickopen/browser/quickopen.contribution.ts index 06099c31f9..29dd046e0c 100644 --- a/src/vs/workbench/contrib/quickopen/browser/quickopen.contribution.ts +++ b/src/vs/workbench/contrib/quickopen/browser/quickopen.contribution.ts @@ -166,16 +166,14 @@ MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, { // Go to menu -// {{SQL CARBON EDIT}} - Disable unused menu item -// MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, { -// group: '4_symbol_nav', -// command: { -// id: 'workbench.action.gotoSymbol', -// title: nls.localize({ key: 'miGotoSymbolInFile', comment: ['&& denotes a mnemonic'] }, "Go to &&Symbol in File...") -// }, -// order: 1 -// }); -// {{SQL CARBON EDIT}} - End +MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, { + group: '4_symbol_nav', + command: { + id: 'workbench.action.gotoSymbol', + title: nls.localize({ key: 'miGotoSymbolInFile', comment: ['&& denotes a mnemonic'] }, "Go to &&Symbol in File...") + }, + order: 1 +}); MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, { group: '5_infile_nav', diff --git a/src/vs/workbench/contrib/search/browser/search.contribution.ts b/src/vs/workbench/contrib/search/browser/search.contribution.ts index 95afb5683d..6845ececa3 100644 --- a/src/vs/workbench/contrib/search/browser/search.contribution.ts +++ b/src/vs/workbench/contrib/search/browser/search.contribution.ts @@ -800,13 +800,11 @@ MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, { // Go to menu -// {{SQL CARBON EDIT}} - Disable unused menu item -// MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, { -// group: '3_global_nav', -// command: { -// id: 'workbench.action.showAllSymbols', -// title: nls.localize({ key: 'miGotoSymbolInWorkspace', comment: ['&& denotes a mnemonic'] }, "Go to Symbol in &&Workspace...") -// }, -// order: 2 -// }); -// {{SQL CARBON EDIT}} - End +MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, { + group: '3_global_nav', + command: { + id: 'workbench.action.showAllSymbols', + title: nls.localize({ key: 'miGotoSymbolInWorkspace', comment: ['&& denotes a mnemonic'] }, "Go to Symbol in &&Workspace...") + }, + order: 2 +});