Skip to content

Commit 99d959a

Browse files
committed
Revert "terminal: default 'terminal.integrated.inheritEnv' to false on Windows (#252325)"
This reverts commit ae60800.
1 parent d6b261f commit 99d959a

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

src/vs/platform/terminal/common/terminalPlatformConfiguration.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import { getAllCodicons } from '../../../base/common/codicons.js';
77
import { IJSONSchema, IJSONSchemaMap } from '../../../base/common/jsonSchema.js';
8-
import { isWindows, OperatingSystem, Platform, PlatformToString } from '../../../base/common/platform.js';
8+
import { OperatingSystem, Platform, PlatformToString } from '../../../base/common/platform.js';
99
import { localize } from '../../../nls.js';
1010
import { ConfigurationScope, Extensions, IConfigurationNode, IConfigurationRegistry } from '../../configuration/common/configurationRegistry.js';
1111
import { Registry } from '../../registry/common/platform.js';
@@ -336,10 +336,9 @@ const terminalPlatformConfiguration: IConfigurationNode = {
336336
},
337337
[TerminalSettingId.InheritEnv]: {
338338
scope: ConfigurationScope.APPLICATION,
339-
description: localize('terminal.integrated.inheritEnv', "Whether new shells should inherit their environment from VS Code, which may source a login shell to ensure $PATH and other development variables are initialized."),
339+
description: localize('terminal.integrated.inheritEnv', "Whether new shells should inherit their environment from VS Code, which may source a login shell to ensure $PATH and other development variables are initialized. This has no effect on Windows."),
340340
type: 'boolean',
341-
// False by default on Windows to prevent powershell inheritance issues (#251446)
342-
default: isWindows ? false : true,
341+
default: true
343342
},
344343
[TerminalSettingId.PersistentSessionScrollback]: {
345344
scope: ConfigurationScope.APPLICATION,

0 commit comments

Comments
 (0)