mirror of
https://github.com/Microsoft/vscode
synced 2024-09-18 01:58:27 +00:00
Bring back TerminalSettingId usage in platform
This commit is contained in:
parent
d7b70a6fdb
commit
10ad00891d
|
@ -5,7 +5,7 @@
|
|||
|
||||
import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
|
||||
import { ILogService } from 'vs/platform/log/common/log';
|
||||
import { IPtyService, IProcessDataEvent, IShellLaunchConfig, ITerminalDimensionsOverride, ITerminalLaunchError, ITerminalsLayoutInfo, TerminalIpcChannels, IHeartbeatService, HeartbeatConstants, TerminalShellType, ITerminalProfile, IRequestResolveVariablesEvent, SafeConfigProvider } from 'vs/platform/terminal/common/terminal';
|
||||
import { IPtyService, IProcessDataEvent, IShellLaunchConfig, ITerminalDimensionsOverride, ITerminalLaunchError, ITerminalsLayoutInfo, TerminalIpcChannels, IHeartbeatService, HeartbeatConstants, TerminalShellType, ITerminalProfile, IRequestResolveVariablesEvent, SafeConfigProvider, TerminalSettingId } from 'vs/platform/terminal/common/terminal';
|
||||
import { Client } from 'vs/base/parts/ipc/node/ipc.cp';
|
||||
import { FileAccess } from 'vs/base/common/network';
|
||||
import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
|
||||
|
@ -326,7 +326,7 @@ export class PtyHostService extends Disposable implements IPtyService {
|
|||
|
||||
private _buildSafeConfigProvider(): SafeConfigProvider {
|
||||
return (key: string) => {
|
||||
const isWorkspaceConfigAllowed = this._configurationService.getValue('terminal.integrated.allowWorkspaceConfiguration');
|
||||
const isWorkspaceConfigAllowed = this._configurationService.getValue(TerminalSettingId.AllowWorkspaceConfiguration);
|
||||
if (isWorkspaceConfigAllowed) {
|
||||
return this._configurationService.getValue(key) as any;
|
||||
}
|
||||
|
|
|
@ -10,7 +10,7 @@ import { findExecutable, getWindowsBuildNumber } from 'vs/platform/terminal/node
|
|||
import * as cp from 'child_process';
|
||||
import { ILogService } from 'vs/platform/log/common/log';
|
||||
import * as pfs from 'vs/base/node/pfs';
|
||||
import { ITerminalEnvironment, ITerminalProfile, ITerminalProfileObject, ProfileSource, SafeConfigProvider } from 'vs/platform/terminal/common/terminal';
|
||||
import { ITerminalEnvironment, ITerminalProfile, ITerminalProfileObject, ProfileSource, SafeConfigProvider, TerminalSettingId } from 'vs/platform/terminal/common/terminal';
|
||||
import { Codicon } from 'vs/base/common/codicons';
|
||||
import { isMacintosh, isWindows } from 'vs/base/common/platform';
|
||||
|
||||
|
@ -33,9 +33,9 @@ export function detectAvailableProfiles(
|
|||
includeDetectedProfiles,
|
||||
fsProvider,
|
||||
logService,
|
||||
safeConfigProvider('terminal.integrated.useWslProfiles') || true,
|
||||
safeConfigProvider('terminal.integrated.profiles.windows'),
|
||||
safeConfigProvider('terminal.integrated.defaultProfile.windows'),
|
||||
safeConfigProvider(TerminalSettingId.UseWslProfiles) || true,
|
||||
safeConfigProvider(TerminalSettingId.ProfilesWindows),
|
||||
safeConfigProvider(TerminalSettingId.DefaultProfileWindows),
|
||||
variableResolver
|
||||
);
|
||||
}
|
||||
|
@ -43,8 +43,8 @@ export function detectAvailableProfiles(
|
|||
fsProvider,
|
||||
logService,
|
||||
includeDetectedProfiles,
|
||||
safeConfigProvider(`terminal.integrated.profiles.${isMacintosh ? 'osx' : 'linux'}`),
|
||||
safeConfigProvider(`terminal.integrated.defaultProfile.${isMacintosh ? 'osx' : 'linux'}`),
|
||||
safeConfigProvider(isMacintosh ? TerminalSettingId.ProfilesMacOs : TerminalSettingId.ProfilesLinux),
|
||||
safeConfigProvider(isMacintosh ? TerminalSettingId.DefaultProfileMacOs : TerminalSettingId.DefaultProfileLinux),
|
||||
testPaths,
|
||||
variableResolver
|
||||
);
|
||||
|
|
Loading…
Reference in a new issue