Merge pull request #202291 from microsoft/merogge/duplicates

de-duplicate command IDs
This commit is contained in:
Megan Rogge 2024-01-11 15:27:04 -08:00 committed by GitHub
commit 2171b54b4d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions

View file

@ -451,9 +451,11 @@ export const enum TerminalCommandId {
ScrollDownLine = 'workbench.action.terminal.scrollDown',
ScrollDownPage = 'workbench.action.terminal.scrollDownPage',
ScrollToBottom = 'workbench.action.terminal.scrollToBottom',
ScrollToBottomAccessibleView = 'workbench.action.terminal.scrollToBottomAccessibleView',
ScrollUpLine = 'workbench.action.terminal.scrollUp',
ScrollUpPage = 'workbench.action.terminal.scrollUpPage',
ScrollToTop = 'workbench.action.terminal.scrollToTop',
ScrollToTopAccessibleView = 'workbench.action.terminal.scrollToTopAccessibleView',
Clear = 'workbench.action.terminal.clear',
ClearSelection = 'workbench.action.terminal.clearSelection',
ChangeIcon = 'workbench.action.terminal.changeIcon',

View file

@ -324,8 +324,8 @@ registerTerminalAction({
});
registerTerminalAction({
id: TerminalCommandId.ScrollToBottom,
title: localize2('workbench.action.terminal.scrollToBottom', 'Scroll to Bottom'),
id: TerminalCommandId.ScrollToBottomAccessibleView,
title: localize2('workbench.action.terminal.scrollToBottomAccessibleView', 'Scroll to Accessible View Bottom'),
precondition: ContextKeyExpr.and(ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.terminalHasBeenCreated), ContextKeyExpr.and(accessibleViewIsShown, ContextKeyExpr.equals(accessibleViewCurrentProviderId.key, AccessibleViewProviderId.Terminal))),
keybinding: {
primary: KeyMod.CtrlCmd | KeyCode.End,
@ -344,8 +344,8 @@ registerTerminalAction({
});
registerTerminalAction({
id: TerminalCommandId.ScrollToTop,
title: localize2('workbench.action.terminal.scrollToTop', 'Scroll to Top'),
id: TerminalCommandId.ScrollToTopAccessibleView,
title: localize2('workbench.action.terminal.scrollToTopAccessibleView', 'Scroll to Accessible View Top'),
precondition: ContextKeyExpr.and(ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.terminalHasBeenCreated), ContextKeyExpr.and(accessibleViewIsShown, ContextKeyExpr.equals(accessibleViewCurrentProviderId.key, AccessibleViewProviderId.Terminal))),
keybinding: {
primary: KeyMod.CtrlCmd | KeyCode.Home,