maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Disable relaunch in tests

Browse source
This commit is contained in:
Daniel Imms 2021-03-05 17:51:34 -08:00
parent 755fae50ab
commit 02a5d5925b
4 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts
View file

@ -25,6 +25,8 @@ import { assertNoRpc } from '../utils';
await config.update('showExitAlert', false, ConfigurationTarget.Global);
// Canvas may cause problems when running in a container
await config.update('rendererType', 'dom', ConfigurationTarget.Global);
// Disable env var relaunch for tests to prevent terminals relaunching themselves
await config.update('environmentChangesRelaunch', false, ConfigurationTarget.Global);
});
suite('Terminal', () => {

10
src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
View file

@ -1566,7 +1566,15 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
// Recreate the process if the terminal has not yet been interacted with and it's not a
// special terminal (eg. task, extension terminal)
if (info.requiresAction && !this._processManager.hasWrittenData && !this._shellLaunchConfig.isFeatureTerminal && !this._shellLaunchConfig.isExtensionCustomPtyTerminal && !this._shellLaunchConfig.isExtensionOwnedTerminal && !this._shellLaunchConfig.attachPersistentProcess) {
if (
info.requiresAction &&
this._configHelper.config.environmentChangesRelaunch &&
!this._processManager.hasWrittenData &&
!this._shellLaunchConfig.isFeatureTerminal &&
!this._shellLaunchConfig.isExtensionCustomPtyTerminal
&& !this._shellLaunchConfig.isExtensionOwnedTerminal &&
!this._shellLaunchConfig.attachPersistentProcess
) {
this.relaunch();
return;
}

1
src/vs/workbench/contrib/terminal/common/terminal.ts
View file

@ -130,6 +130,7 @@ export interface ITerminalConfiguration {
windows: { [key: string]: string };
};
environmentChangesIndicator: 'off' | 'on' | 'warnonly';
environmentChangesRelaunch: boolean;
showExitAlert: boolean;
splitCwd: 'workspaceRoot' | 'initial' | 'inherited';
windowsEnableConpty: boolean;

5
src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
View file

@ -311,6 +311,11 @@ export const terminalConfiguration: IConfigurationNode = {
],
default: 'warnonly'
},
'terminal.integrated.environmentChangesRelaunch': {
markdownDescription: localize('terminal.integrated.environmentChangesRelaunch', "Whether to relaunch terminals automatically if extension want to contribute to their environment and have not been interacted with yet."),
type: 'boolean',
default: true
},
'terminal.integrated.showExitAlert': {
description: localize('terminal.integrated.showExitAlert', "Controls whether to show the alert \"The terminal process terminated with exit code\" when exit code is non-zero."),
type: 'boolean',