Skip to content

Commit dbdfe6d

Browse files
authored
Merge pull request microsoft#242228 from microsoft/tyriar/242227
Fix default for conpty and env reporting settings
2 parents 941479b + cc54a91 commit dbdfe6d

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts

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

66
import { Codicon } from '../../../../base/common/codicons.js';
77
import { isMacintosh, isWindows } from '../../../../base/common/platform.js';
8-
import { IProductConfiguration } from '../../../../base/common/product.js';
98
import { localize } from '../../../../nls.js';
109
import { ConfigurationScope, Extensions, IConfigurationNode, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
10+
import product from '../../../../platform/product/common/product.js';
1111
import { Registry } from '../../../../platform/registry/common/platform.js';
1212
import { TerminalLocationString, TerminalSettingId } from '../../../../platform/terminal/common/terminal.js';
1313
import { terminalColorSchema, terminalIconSchema } from '../../../../platform/terminal/common/terminalPlatformConfiguration.js';
@@ -486,10 +486,7 @@ const terminalConfiguration: IConfigurationNode = {
486486
markdownDescription: localize('terminal.integrated.windowsUseConptyDll', "Whether to use the experimental conpty.dll (v1.22.250204002) shipped with VS Code, instead of the one bundled with Windows."),
487487
type: 'boolean',
488488
tags: ['preview'],
489-
default: ((): boolean => {
490-
const productService = Registry.as<IConfigurationRegistry>(Extensions.Configuration).getConfigurations()[0] as IProductConfiguration;
491-
return productService?.quality !== 'stable';
492-
})()
489+
default: product.quality !== 'stable',
493490
},
494491
[TerminalSettingId.SplitCwd]: {
495492
description: localize('terminal.integrated.splitCwd', "Controls the working directory a split terminal starts with."),
@@ -613,10 +610,7 @@ const terminalConfiguration: IConfigurationNode = {
613610
[TerminalSettingId.ShellIntegrationEnvironmentReporting]: {
614611
markdownDescription: localize('terminal.integrated.shellIntegration.environmentReporting', "Controls whether to report the shell environment, enabling its use in features such as {0}. This may cause a slowdown when printing your shell's prompt.", `\`#${TerminalContribSettingId.SuggestEnabled}#\``),
615612
type: 'boolean',
616-
default: ((): boolean => {
617-
const productService = Registry.as<IConfigurationRegistry>(Extensions.Configuration).getConfigurations()[0] as IProductConfiguration;
618-
return productService?.quality !== 'stable';
619-
})()
613+
default: product.quality !== 'stable',
620614
},
621615
[TerminalSettingId.SmoothScrolling]: {
622616
markdownDescription: localize('terminal.integrated.smoothScrolling', "Controls whether the terminal will scroll using an animation."),

0 commit comments

Comments
 (0)