ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-31 09:10:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode fa77b52b5e2067798006aaff8e463a2b425509d5 (#5453)

Browse Source
This commit is contained in:
Anthony Dresser
2019-05-13 10:57:51 -07:00
committed by GitHub
parent 34eef8e97d
commit 43293b98c0
15 changed files with 338 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts
View File

@@ -182,7 +182,8 @@ export class TerminalProcessManager implements ITerminalProcessManager {
const env = terminalEnvironment.createTerminalEnvironment(shellLaunchConfig, lastActiveWorkspace, envFromConfigValue, this._configurationResolverService, isWorkspaceShellAllowed, this._productService.version, this._configHelper.config.setLocaleVariables);
this._logService.debug(`Terminal process launching`, shellLaunchConfig, initialCwd, cols, rows, env);
return this._terminalInstanceService.createTerminalProcess(shellLaunchConfig, initialCwd, cols, rows, env, this._configHelper.config.windowsEnableConpty);
const useConpty = (shellLaunchConfig.forceWinpty !== true) && this._configHelper.config.windowsEnableConpty;
return this._terminalInstanceService.createTerminalProcess(shellLaunchConfig, initialCwd, cols, rows, env, useConpty);
}
public setDimensions(cols: number, rows: number): void {

6
src/vs/workbench/contrib/terminal/common/terminal.ts
View File

@@ -192,6 +192,12 @@ export interface IShellLaunchConfig {
* provided as nothing will be inherited from the process or any configuration.
*/
strictEnv?: boolean;
/**
* Moving forward, conpty will be the default. However, there are cases where conpty is not ready
* to be the default. This property will force winpty to be used, even when conpty would normally be used.
*/
forceWinpty?: boolean;
}
export interface ITerminalService {