From 54d9b7f8a03433847b8fd933fdc3b9a508564f81 Mon Sep 17 00:00:00 2001 From: James Date: Sun, 10 Nov 2019 19:13:14 -0500 Subject: [PATCH 1/3] fix-84080 added cntl-shift-c and cntl-shift-v to terminal --- .../contrib/terminal/browser/terminal.contribution.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts index 485539d452b99..a0995955c69ad 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts @@ -552,16 +552,18 @@ actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(FindPrevious, Fi mac: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_G, secondary: [KeyMod.Shift | KeyCode.F3, KeyCode.Enter] }, }, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_FOCUSED), 'Terminal: Find previous', category); -// Commands miht be affected by Web restrictons +// Commands might be affected by Web restrictons if (BrowserFeatures.clipboard.writeText) { actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(CopyTerminalSelectionAction, CopyTerminalSelectionAction.ID, CopyTerminalSelectionAction.LABEL, { primary: KeyMod.CtrlCmd | KeyCode.KEY_C, + secondary: [KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_C], linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_C } }, ContextKeyExpr.and(KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED, KEYBINDING_CONTEXT_TERMINAL_FOCUS)), 'Terminal: Copy Selection', category); } if (BrowserFeatures.clipboard.readText) { actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(TerminalPasteAction, TerminalPasteAction.ID, TerminalPasteAction.LABEL, { primary: KeyMod.CtrlCmd | KeyCode.KEY_V, + secondary: [KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_V], linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_V } }, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Paste into Active Terminal', category); } From 18c8bd89f850470263296374c3d8ea78c7ec602c Mon Sep 17 00:00:00 2001 From: James Inkster <42331013+Grommers00@users.noreply.github.com> Date: Thu, 14 Nov 2019 07:19:17 -0500 Subject: [PATCH 2/3] Update terminal.contribution.ts --- .../terminal/browser/terminal.contribution.ts | 40 ++++++++++++++----- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts index a0995955c69ad..62f14a0cf4367 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts @@ -554,18 +554,38 @@ actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(FindPrevious, Fi // Commands might be affected by Web restrictons if (BrowserFeatures.clipboard.writeText) { - actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(CopyTerminalSelectionAction, CopyTerminalSelectionAction.ID, CopyTerminalSelectionAction.LABEL, { - primary: KeyMod.CtrlCmd | KeyCode.KEY_C, - secondary: [KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_C], - linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_C } - }, ContextKeyExpr.and(KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED, KEYBINDING_CONTEXT_TERMINAL_FOCUS)), 'Terminal: Copy Selection', category); + actionRegistry.registerWorkbenchAction( + new SyncActionDescriptor( + CopyTerminalSelectionAction, + CopyTerminalSelectionAction.ID, + CopyTerminalSelectionAction.LABEL, + { + primary: KeyMod.CtrlCmd | KeyCode.KEY_C, + win: { primary: KeyCode.Ctrl | KeyCode.KEY_C, secondary: [KeyCode.Ctrl | KeyCode.Shift | KeyCode.KEY_C] }, + linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_C } + }, + ContextKeyExpr.and(KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED, KEYBINDING_CONTEXT_TERMINAL_FOCUS) + ), + 'Terminal: Copy Selection', + category + ); } if (BrowserFeatures.clipboard.readText) { - actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(TerminalPasteAction, TerminalPasteAction.ID, TerminalPasteAction.LABEL, { - primary: KeyMod.CtrlCmd | KeyCode.KEY_V, - secondary: [KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_V], - linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_V } - }, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Paste into Active Terminal', category); + actionRegistry.registerWorkbenchAction( + new SyncActionDescriptor( + TerminalPasteAction, + TerminalPasteAction.ID, + TerminalPasteAction.LABEL, + { + primary: KeyMod.CtrlCmd | KeyCode.KEY_V, + win: { primary: KeyCode.Ctrl | KeyCode.KEY_V, secondary: [KeyCode.Ctrl | KeyCode.Shift | KeyCode.KEY_V] }, + linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_V } + }, + KEYBINDING_CONTEXT_TERMINAL_FOCUS + ), + 'Terminal: Paste into Active Terminal', + category + ); } (new SendSequenceTerminalCommand({ From 04d033be008f2d04e6edad81f386820f858f44f2 Mon Sep 17 00:00:00 2001 From: James Inkster <42331013+Grommers00@users.noreply.github.com> Date: Thu, 14 Nov 2019 07:27:50 -0500 Subject: [PATCH 3/3] Update terminal.contribution.ts --- .../terminal/browser/terminal.contribution.ts | 41 +++++-------------- 1 file changed, 10 insertions(+), 31 deletions(-) diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts index 62f14a0cf4367..5cb8a2580d89a 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts @@ -554,40 +554,19 @@ actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(FindPrevious, Fi // Commands might be affected by Web restrictons if (BrowserFeatures.clipboard.writeText) { - actionRegistry.registerWorkbenchAction( - new SyncActionDescriptor( - CopyTerminalSelectionAction, - CopyTerminalSelectionAction.ID, - CopyTerminalSelectionAction.LABEL, - { - primary: KeyMod.CtrlCmd | KeyCode.KEY_C, - win: { primary: KeyCode.Ctrl | KeyCode.KEY_C, secondary: [KeyCode.Ctrl | KeyCode.Shift | KeyCode.KEY_C] }, - linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_C } - }, - ContextKeyExpr.and(KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED, KEYBINDING_CONTEXT_TERMINAL_FOCUS) - ), - 'Terminal: Copy Selection', - category - ); + actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(CopyTerminalSelectionAction, CopyTerminalSelectionAction.ID, CopyTerminalSelectionAction.LABEL, { + primary: KeyMod.CtrlCmd | KeyCode.KEY_C, + win: { primary: KeyCode.Ctrl | KeyCode.KEY_C, secondary: [KeyCode.Ctrl | KeyCode.Shift | KeyCode.KEY_C] }, + linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_C } + }, ContextKeyExpr.and(KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED, KEYBINDING_CONTEXT_TERMINAL_FOCUS)), 'Terminal: Copy Selection', category); } if (BrowserFeatures.clipboard.readText) { - actionRegistry.registerWorkbenchAction( - new SyncActionDescriptor( - TerminalPasteAction, - TerminalPasteAction.ID, - TerminalPasteAction.LABEL, - { - primary: KeyMod.CtrlCmd | KeyCode.KEY_V, - win: { primary: KeyCode.Ctrl | KeyCode.KEY_V, secondary: [KeyCode.Ctrl | KeyCode.Shift | KeyCode.KEY_V] }, - linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_V } - }, - KEYBINDING_CONTEXT_TERMINAL_FOCUS - ), - 'Terminal: Paste into Active Terminal', - category - ); + actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(TerminalPasteAction, TerminalPasteAction.ID, TerminalPasteAction.LABEL, { + primary: KeyMod.CtrlCmd | KeyCode.KEY_V, + win: { primary: KeyCode.Ctrl | KeyCode.KEY_V, secondary: [KeyCode.Ctrl | KeyCode.Shift | KeyCode.KEY_V] }, + linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_V } + }, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Paste into Active Terminal', category); } - (new SendSequenceTerminalCommand({ id: SendSequenceTerminalCommand.ID, precondition: undefined,