From 4e0b249b19037432ed6f952578b64d21a9bb3c97 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Mon, 13 Apr 2020 19:57:42 -0700 Subject: [PATCH] Only use pwsh paste on PowerShell 6+ Fixes #95169 --- .../contrib/terminal/browser/terminal.contribution.ts | 2 +- src/vs/workbench/contrib/terminal/browser/terminal.ts | 3 ++- .../contrib/terminal/electron-browser/windowsShellHelper.ts | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts index 25a2010e1c95a..b6c1186cbaf62 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts @@ -153,7 +153,7 @@ if (BrowserFeatures.clipboard.readText) { // shell, this gets handled by PSReadLine which properly handles multi-line pastes if (platform.isWindows) { registerSendSequenceKeybinding(String.fromCharCode('V'.charCodeAt(0) - 64), { // ctrl+v - when: ContextKeyExpr.and(KEYBINDING_CONTEXT_TERMINAL_FOCUS, ContextKeyExpr.equals(KEYBINDING_CONTEXT_TERMINAL_SHELL_TYPE_KEY, WindowsShellType.PowerShell)), + when: ContextKeyExpr.and(KEYBINDING_CONTEXT_TERMINAL_FOCUS, ContextKeyExpr.equals(KEYBINDING_CONTEXT_TERMINAL_SHELL_TYPE_KEY, WindowsShellType.Pwsh)), primary: KeyMod.CtrlCmd | KeyCode.KEY_V }); } diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.ts b/src/vs/workbench/contrib/terminal/browser/terminal.ts index e33616878aba8..0dfbbbf42a9b8 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminal.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminal.ts @@ -188,7 +188,8 @@ export interface ISearchOptions { export enum WindowsShellType { CommandPrompt = 'cmd', - PowerShell = 'pwsh', + PowerShell = 'powershell', + Pwsh = 'pwsh', Wsl = 'wsl', GitBash = 'gitbash' } diff --git a/src/vs/workbench/contrib/terminal/electron-browser/windowsShellHelper.ts b/src/vs/workbench/contrib/terminal/electron-browser/windowsShellHelper.ts index 4f00f5b0f2712..a0abcaa7e0c16 100644 --- a/src/vs/workbench/contrib/terminal/electron-browser/windowsShellHelper.ts +++ b/src/vs/workbench/contrib/terminal/electron-browser/windowsShellHelper.ts @@ -151,8 +151,9 @@ export class WindowsShellHelper extends Disposable implements IWindowsShellHelpe case 'cmd.exe': return WindowsShellType.CommandPrompt; case 'powershell.exe': - case 'pwsh.exe': return WindowsShellType.PowerShell; + case 'pwsh.exe': + return WindowsShellType.Pwsh; case 'bash.exe': return WindowsShellType.GitBash; case 'wsl.exe':