From 723b20093d2f525e84cdf94a52f7695d1d539273 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Thu, 2 Feb 2017 17:50:04 -0800 Subject: [PATCH] Only enable flow control on bash for now Fixes #19766 Related #19474 --- .../workbench/parts/terminal/electron-browser/terminal.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminal.ts b/src/vs/workbench/parts/terminal/electron-browser/terminal.ts index 91ba83ca066..40fe6b0ea12 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminal.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminal.ts @@ -20,9 +20,10 @@ const powerShellPath = `${process.env.windir}\\${is64BitWindows ? 'Sysnative' : export const TERMINAL_DEFAULT_SHELL_WINDOWS = isAtLeastWindows10 ? powerShellPath : processes.getWindowsShell(); // Terminal flow control is disabled if the shell is zsh since the popular oh-my-zsh configuration -// overrides the ^S and ^Q keybindings which are used for flow control. -// TODO: This should check if ~/.oh-my-zsh exists as well -export const TERMINAL_DEFAULT_FLOW_CONTROL = !(typeof process.env.SHELL === 'string' && path.basename(process.env.SHELL) === 'zsh'); +// overrides the ^S and ^Q keybindings which are used for flow control. fish also overrides the +// keybindings. +// TODO #19474: This should be enabled for zsh when ~/.oh-my-zsh does not exist as well +export const TERMINAL_DEFAULT_FLOW_CONTROL = (typeof process.env.SHELL === 'string' && path.basename(process.env.SHELL) === 'bash'); export interface ITerminalProcessFactory { create(env: { [key: string]: string }): cp.ChildProcess; -- GitLab