From e0be278412332f29c436b8b215f882a8e62d6a1a Mon Sep 17 00:00:00 2001 From: Tyler James Leonhardt Date: Fri, 26 Mar 2021 10:32:16 -0700 Subject: [PATCH 1/5] Bump version to 1.56.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 49c9aeb30c532..9988bcd419726 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "code-oss-dev", - "version": "1.55.0", + "version": "1.56.0", "distro": "c57566e89bbb245d7e1a5d789b9367f5a7b8bc05", "author": { "name": "Microsoft Corporation" From ffaef310822a2c4a12462253eb5599a8d86151e8 Mon Sep 17 00:00:00 2001 From: meganrogge Date: Fri, 26 Mar 2021 11:43:06 -0700 Subject: [PATCH 2/5] use ctrl not ctrlCmd --- .../workbench/contrib/terminal/browser/terminal.contribution.ts | 2 +- 1 file changed, 1 insertion(+), 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 0537989641088..8884e9382fd62 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts @@ -125,7 +125,7 @@ if (platform.isWindows) { if (isIPad) { registerSendSequenceKeybinding(String.fromCharCode('C'.charCodeAt(0) - CTRL_LETTER_OFFSET), { // ctrl+c when: ContextKeyExpr.and(KEYBINDING_CONTEXT_TERMINAL_FOCUS), - primary: KeyMod.CtrlCmd | KeyCode.KEY_C + primary: KeyCode.Ctrl | KeyCode.KEY_C }); } From aab9fb683d049e89133f4fb5f595529ed920e591 Mon Sep 17 00:00:00 2001 From: meganrogge Date: Fri, 26 Mar 2021 11:59:53 -0700 Subject: [PATCH 3/5] revert change to package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9988bcd419726..49c9aeb30c532 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "code-oss-dev", - "version": "1.56.0", + "version": "1.55.0", "distro": "c57566e89bbb245d7e1a5d789b9367f5a7b8bc05", "author": { "name": "Microsoft Corporation" From 79970ed7bbf2d53bfcdf7a421e33fc1ebfafc751 Mon Sep 17 00:00:00 2001 From: meganrogge Date: Fri, 26 Mar 2021 12:05:31 -0700 Subject: [PATCH 4/5] use winctrl --- .../workbench/contrib/terminal/browser/terminal.contribution.ts | 2 +- 1 file changed, 1 insertion(+), 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 8884e9382fd62..23ed5f337cdf9 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts @@ -125,7 +125,7 @@ if (platform.isWindows) { if (isIPad) { registerSendSequenceKeybinding(String.fromCharCode('C'.charCodeAt(0) - CTRL_LETTER_OFFSET), { // ctrl+c when: ContextKeyExpr.and(KEYBINDING_CONTEXT_TERMINAL_FOCUS), - primary: KeyCode.Ctrl | KeyCode.KEY_C + primary: KeyCode.WinCtrl | KeyCode.KEY_C }); } From 539c1ee2b9d98a2a456d08772933ed1c844740ad Mon Sep 17 00:00:00 2001 From: meganrogge Date: Fri, 26 Mar 2021 12:11:22 -0700 Subject: [PATCH 5/5] keymod not keycode --- .../workbench/contrib/terminal/browser/terminal.contribution.ts | 2 +- 1 file changed, 1 insertion(+), 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 23ed5f337cdf9..d7f48b359048f 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts @@ -125,7 +125,7 @@ if (platform.isWindows) { if (isIPad) { registerSendSequenceKeybinding(String.fromCharCode('C'.charCodeAt(0) - CTRL_LETTER_OFFSET), { // ctrl+c when: ContextKeyExpr.and(KEYBINDING_CONTEXT_TERMINAL_FOCUS), - primary: KeyCode.WinCtrl | KeyCode.KEY_C + primary: KeyMod.WinCtrl | KeyCode.KEY_C }); }