Skip to content

Commit 87eb9ff

Browse files
authored
Merge pull request microsoft#208415 from microsoft/tyriar/204167
Include env in unsafe profiles config
2 parents e679614 + eae98ba commit 87eb9ff

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

src/vs/workbench/contrib/terminal/browser/terminalProfileQuickpick.ts

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import { Codicon } from 'vs/base/common/codicons';
77
import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
88
import { IQuickInputService, IKeyMods, IPickOptions, IQuickPickSeparator, IQuickInputButton, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
9-
import { IExtensionTerminalProfile, ITerminalProfile, ITerminalProfileObject, TerminalSettingPrefix } from 'vs/platform/terminal/common/terminal';
9+
import { IExtensionTerminalProfile, ITerminalProfile, ITerminalProfileObject, TerminalSettingPrefix, type ITerminalExecutable } from 'vs/platform/terminal/common/terminal';
1010
import { getUriClasses, getColorClass, createColorStyleElement } from 'vs/workbench/contrib/terminal/browser/terminalIcon';
1111
import { configureTerminalProfileIcon } from 'vs/workbench/contrib/terminal/browser/terminalIcons';
1212
import * as nls from 'vs/nls';
@@ -131,11 +131,20 @@ export class TerminalProfileQuickpick {
131131
if (!name) {
132132
return;
133133
}
134-
const newConfigValue: { [key: string]: ITerminalProfileObject } = { ...configProfiles };
135-
newConfigValue[name] = {
136-
path: context.item.profile.path,
137-
args: context.item.profile.args
138-
};
134+
const newConfigValue: { [key: string]: ITerminalExecutable } = { ...configProfiles };
135+
newConfigValue[name] = { path: context.item.profile.path };
136+
if (context.item.profile.args) {
137+
newConfigValue[name].args = context.item.profile.args;
138+
}
139+
if (context.item.profile.env) {
140+
newConfigValue[name].env = context.item.profile.env;
141+
}
142+
if (context.item.profile.color) {
143+
newConfigValue[name].color = context.item.profile.color;
144+
}
145+
if (context.item.profile.icon) {
146+
newConfigValue[name].icon = context.item.profile.icon;
147+
}
139148
await this._configurationService.updateValue(profilesKey, newConfigValue, ConfigurationTarget.USER);
140149
},
141150
onKeyMods: mods => keyMods = mods

0 commit comments

Comments
 (0)