Skip to content

V
vscode

xxadev / vscode
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
V
vscode

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 c71fa38d 编写于 作者: S Sandeep Somavarapu
浏览文件
操作

rename

上级 4cdb067a
隐藏空白更改
内联 并排
Showing with 90 addition and 90 deletion
src/vs/editor/common/services/resourceConfigurationImpl.ts
浏览文件 @ c71fa38d
......@@ -45,15 +45,15 @@ export class TextResourceConfigurationService extends Disposable implements IRes
}
switch (configurationTarget) {
case ConfigurationTarget.MEMORY:
return this._updateValue(key, value, configurationTarget, configurationValue.memoryTarget?.override, resource, language);
return this._updateValue(key, value, configurationTarget, configurationValue.memory?.override, resource, language);
case ConfigurationTarget.WORKSPACE_FOLDER:
return this._updateValue(key, value, configurationTarget, configurationValue.workspaceFolderTarget?.override, resource, language);
return this._updateValue(key, value, configurationTarget, configurationValue.workspaceFolder?.override, resource, language);
case ConfigurationTarget.WORKSPACE:
return this._updateValue(key, value, configurationTarget, configurationValue.workspaceTarget?.override, resource, language);
return this._updateValue(key, value, configurationTarget, configurationValue.workspace?.override, resource, language);
case ConfigurationTarget.USER_REMOTE:
return this._updateValue(key, value, configurationTarget, configurationValue.userRemoteTarget?.override, resource, language);
return this._updateValue(key, value, configurationTarget, configurationValue.userRemote?.override, resource, language);
default:
return this._updateValue(key, value, configurationTarget, configurationValue.userLocalTarget?.override, resource, language);
return this._updateValue(key, value, configurationTarget, configurationValue.userLocal?.override, resource, language);
}
}
......@@ -67,32 +67,32 @@ export class TextResourceConfigurationService extends Disposable implements IRes
private deriveConfigurationTarget(configurationValue: IConfigurationValue<any>, language: string | null): ConfigurationTarget {
if (language) {
if (configurationValue.memoryTarget?.override !== undefined) {
if (configurationValue.memory?.override !== undefined) {
return ConfigurationTarget.MEMORY;
}
if (configurationValue.workspaceFolderTarget?.override !== undefined) {
if (configurationValue.workspaceFolder?.override !== undefined) {
return ConfigurationTarget.WORKSPACE_FOLDER;
}
if (configurationValue.workspaceTarget?.override !== undefined) {
if (configurationValue.workspace?.override !== undefined) {
return ConfigurationTarget.WORKSPACE;
}
if (configurationValue.userRemoteTarget?.override !== undefined) {
if (configurationValue.userRemote?.override !== undefined) {
return ConfigurationTarget.USER_REMOTE;
}
if (configurationValue.userLocalTarget?.override !== undefined) {
if (configurationValue.userLocal?.override !== undefined) {
return ConfigurationTarget.USER_LOCAL;
}
}
if (configurationValue.memoryTarget?.value !== undefined) {
if (configurationValue.memory?.value !== undefined) {
return ConfigurationTarget.MEMORY;
}
if (configurationValue.workspaceFolderTarget?.value !== undefined) {
if (configurationValue.workspaceFolder?.value !== undefined) {
return ConfigurationTarget.WORKSPACE_FOLDER;
}
if (configurationValue.workspaceTarget?.value !== undefined) {
if (configurationValue.workspace?.value !== undefined) {
return ConfigurationTarget.WORKSPACE;
}
if (configurationValue.userRemoteTarget?.value !== undefined) {
if (configurationValue.userRemote?.value !== undefined) {
return ConfigurationTarget.USER_REMOTE;
}
return ConfigurationTarget.USER_LOCAL;
......
src/vs/editor/test/common/services/resourceConfigurationService.test.ts
浏览文件 @ c71fa38d
......@@ -52,9 +52,9 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue writes into given memory target without overrides', async () => {
language = 'a';
configurationValue = {
defaultTarget: { value: '1' },
userLocalTarget: { value: '2' },
workspaceFolderTarget: { value: '1' },
default: { value: '1' },
userLocal: { value: '2' },
workspaceFolder: { value: '1' },
};
const resource = URI.file('someFile');
......@@ -65,9 +65,9 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue writes into given workspace target without overrides', async () => {
language = 'a';
configurationValue = {
defaultTarget: { value: '1' },
userLocalTarget: { value: '2' },
workspaceFolderTarget: { value: '2' },
default: { value: '1' },
userLocal: { value: '2' },
workspaceFolder: { value: '2' },
};
const resource = URI.file('someFile');
......@@ -78,9 +78,9 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue writes into given user target without overrides', async () => {
language = 'a';
configurationValue = {
defaultTarget: { value: '1' },
userLocalTarget: { value: '2' },
workspaceFolderTarget: { value: '2' },
default: { value: '1' },
userLocal: { value: '2' },
workspaceFolder: { value: '2' },
};
const resource = URI.file('someFile');
......@@ -91,9 +91,9 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue writes into given workspace folder target with overrides', async () => {
language = 'a';
configurationValue = {
defaultTarget: { value: '1' },
userLocalTarget: { value: '2' },
workspaceFolderTarget: { value: '2', override: '1' },
default: { value: '1' },
userLocal: { value: '2' },
workspaceFolder: { value: '2', override: '1' },
};
const resource = URI.file('someFile');
......@@ -104,9 +104,9 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue writes into derived workspace folder target without overrides', async () => {
language = 'a';
configurationValue = {
defaultTarget: { value: '1' },
userLocalTarget: { value: '2' },
workspaceFolderTarget: { value: '2' },
default: { value: '1' },
userLocal: { value: '2' },
workspaceFolder: { value: '2' },
};
const resource = URI.file('someFile');
......@@ -117,10 +117,10 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue writes into derived workspace folder target with overrides', async () => {
language = 'a';
configurationValue = {
defaultTarget: { value: '1' },
userLocalTarget: { value: '2' },
workspaceTarget: { value: '2', override: '1' },
workspaceFolderTarget: { value: '2', override: '2' },
default: { value: '1' },
userLocal: { value: '2' },
workspace: { value: '2', override: '1' },
workspaceFolder: { value: '2', override: '2' },
};
const resource = URI.file('someFile');
......@@ -131,9 +131,9 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue writes into derived workspace target without overrides', async () => {
language = 'a';
configurationValue = {
defaultTarget: { value: '1' },
userLocalTarget: { value: '2' },
workspaceTarget: { value: '2' },
default: { value: '1' },
userLocal: { value: '2' },
workspace: { value: '2' },
};
const resource = URI.file('someFile');
......@@ -144,9 +144,9 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue writes into derived workspace target with overrides', async () => {
language = 'a';
configurationValue = {
defaultTarget: { value: '1' },
userLocalTarget: { value: '2' },
workspaceTarget: { value: '2', override: '2' },
default: { value: '1' },
userLocal: { value: '2' },
workspace: { value: '2', override: '2' },
};
const resource = URI.file('someFile');
......@@ -157,10 +157,10 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue writes into derived workspace target with overrides and value defined in folder', async () => {
language = 'a';
configurationValue = {
defaultTarget: { value: '1', override: '3' },
userLocalTarget: { value: '2' },
workspaceTarget: { value: '2', override: '2' },
workspaceFolderTarget: { value: '2' },
default: { value: '1', override: '3' },
userLocal: { value: '2' },
workspace: { value: '2', override: '2' },
workspaceFolder: { value: '2' },
};
const resource = URI.file('someFile');
......@@ -171,9 +171,9 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue writes into derived user remote target without overrides', async () => {
language = 'a';
configurationValue = {
defaultTarget: { value: '1' },
userLocalTarget: { value: '2' },
userRemoteTarget: { value: '2' },
default: { value: '1' },
userLocal: { value: '2' },
userRemote: { value: '2' },
};
const resource = URI.file('someFile');
......@@ -184,9 +184,9 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue writes into derived user remote target with overrides', async () => {
language = 'a';
configurationValue = {
defaultTarget: { value: '1' },
userLocalTarget: { value: '2' },
userRemoteTarget: { value: '2', override: '3' },
default: { value: '1' },
userLocal: { value: '2' },
userRemote: { value: '2', override: '3' },
};
const resource = URI.file('someFile');
......@@ -197,10 +197,10 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue writes into derived user remote target with overrides and value defined in workspace', async () => {
language = 'a';
configurationValue = {
defaultTarget: { value: '1' },
userLocalTarget: { value: '2' },
userRemoteTarget: { value: '2', override: '3' },
workspaceTarget: { value: '3' }
default: { value: '1' },
userLocal: { value: '2' },
userRemote: { value: '2', override: '3' },
workspace: { value: '3' }
};
const resource = URI.file('someFile');
......@@ -211,11 +211,11 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue writes into derived user remote target with overrides and value defined in workspace folder', async () => {
language = 'a';
configurationValue = {
defaultTarget: { value: '1' },
userLocalTarget: { value: '2', override: '1' },
userRemoteTarget: { value: '2', override: '3' },
workspaceTarget: { value: '3' },
workspaceFolderTarget: { value: '3' }
default: { value: '1' },
userLocal: { value: '2', override: '1' },
userRemote: { value: '2', override: '3' },
workspace: { value: '3' },
workspaceFolder: { value: '3' }
};
const resource = URI.file('someFile');
......@@ -226,8 +226,8 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue writes into derived user target without overrides', async () => {
language = 'a';
configurationValue = {
defaultTarget: { value: '1' },
userLocalTarget: { value: '2' },
default: { value: '1' },
userLocal: { value: '2' },
};
const resource = URI.file('someFile');
......@@ -238,8 +238,8 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue writes into derived user target with overrides', async () => {
language = 'a';
configurationValue = {
defaultTarget: { value: '1' },
userLocalTarget: { value: '2', override: '3' },
default: { value: '1' },
userLocal: { value: '2', override: '3' },
};
const resource = URI.file('someFile');
......@@ -250,9 +250,9 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue writes into derived user target with overrides and value is defined in remote', async () => {
language = 'a';
configurationValue = {
defaultTarget: { value: '1' },
userLocalTarget: { value: '2', override: '3' },
userRemoteTarget: { value: '3' }
default: { value: '1' },
userLocal: { value: '2', override: '3' },
userRemote: { value: '3' }
};
const resource = URI.file('someFile');
......@@ -263,8 +263,8 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue writes into derived user target with overrides and value is defined in workspace', async () => {
language = 'a';
configurationValue = {
defaultTarget: { value: '1' },
userLocalTarget: { value: '2', override: '3' },
default: { value: '1' },
userLocal: { value: '2', override: '3' },
workspaceValue: { value: '3' }
};
const resource = URI.file('someFile');
......@@ -276,9 +276,9 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue writes into derived user target with overrides and value is defined in workspace folder', async () => {
language = 'a';
configurationValue = {
defaultTarget: { value: '1', override: '3' },
userLocalTarget: { value: '2', override: '3' },
userRemoteTarget: { value: '3' },
default: { value: '1', override: '3' },
userLocal: { value: '2', override: '3' },
userRemote: { value: '3' },
workspaceFolderValue: { value: '3' }
};
const resource = URI.file('someFile');
......@@ -290,7 +290,7 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue when not changed', async () => {
language = 'a';
configurationValue = {
defaultTarget: { value: '1' },
default: { value: '1' },
};
const resource = URI.file('someFile');
......
src/vs/platform/configuration/common/configuration.ts
浏览文件 @ c71fa38d
......@@ -76,13 +76,13 @@ export interface IConfigurationValue<T> {
readonly memoryValue?: T;
readonly value?: T;
readonly defaultTarget?: { value?: T, override?: T };
readonly userTarget?: { value?: T, override?: T };
readonly userLocalTarget?: { value?: T, override?: T };
readonly userRemoteTarget?: { value?: T, override?: T };
readonly workspaceTarget?: { value?: T, override?: T };
readonly workspaceFolderTarget?: { value?: T, override?: T };
readonly memoryTarget?: { value?: T, override?: T };
readonly default?: { value?: T, override?: T };
readonly user?: { value?: T, override?: T };
readonly userLocal?: { value?: T, override?: T };
readonly userRemote?: { value?: T, override?: T };
readonly workspace?: { value?: T, override?: T };
readonly workspaceFolder?: { value?: T, override?: T };
readonly memory?: { value?: T, override?: T };
}
export interface IConfigurationService {
......
src/vs/platform/configuration/common/configurationModels.ts
浏览文件 @ c71fa38d
......@@ -402,13 +402,13 @@ export class Configuration {
memoryValue: memoryValue,
value,
defaultTarget: defaultValue !== undefined ? { value: this._defaultConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this._defaultConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
userTarget: userValue !== undefined ? { value: this.userConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this.userConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
userLocalTarget: userLocalValue !== undefined ? { value: this.localUserConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this.localUserConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
userRemoteTarget: userRemoteValue !== undefined ? { value: this.remoteUserConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this.remoteUserConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
workspaceTarget: workspaceValue !== undefined ? { value: this._workspaceConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this._workspaceConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
workspaceFolderTarget: workspaceFolderValue !== undefined ? { value: folderConfigurationModel?.freeze().getValue(key), override: overrides.overrideIdentifier ? folderConfigurationModel?.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
memoryTarget: memoryValue !== undefined ? { value: memoryConfigurationModel.getValue(key), override: overrides.overrideIdentifier ? memoryConfigurationModel.getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
default: defaultValue !== undefined ? { value: this._defaultConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this._defaultConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
user: userValue !== undefined ? { value: this.userConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this.userConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
userLocal: userLocalValue !== undefined ? { value: this.localUserConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this.localUserConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
userRemote: userRemoteValue !== undefined ? { value: this.remoteUserConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this.remoteUserConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
workspace: workspaceValue !== undefined ? { value: this._workspaceConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this._workspaceConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
workspaceFolder: workspaceFolderValue !== undefined ? { value: folderConfigurationModel?.freeze().getValue(key), override: overrides.overrideIdentifier ? folderConfigurationModel?.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
memory: memoryValue !== undefined ? { value: memoryConfigurationModel.getValue(key), override: overrides.overrideIdentifier ? memoryConfigurationModel.getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
};
}
......
src/vs/workbench/contrib/terminal/common/terminalEnvironment.ts
浏览文件 @ c71fa38d
......@@ -246,7 +246,7 @@ export function escapeNonWindowsPath(path: string): string {
}
export function getDefaultShell(
fetchSetting: (key: string) => { user?: string | string[], value?: string | string[], default?: string | string[] },
fetchSetting: (key: string) => { userValue?: string | string[], value?: string | string[], defaultValue?: string | string[] },
isWorkspaceShellAllowed: boolean,
defaultShell: string,
isWoW64: boolean,
......@@ -294,7 +294,7 @@ export function getDefaultShell(
}
export function getDefaultShellArgs(
fetchSetting: (key: string) => { user?: string | string[], value?: string | string[], default?: string | string[] },
fetchSetting: (key: string) => { userValue?: string | string[], value?: string | string[], defaultValue?: string | string[] },
isWorkspaceShellAllowed: boolean,
useAutomationShell: boolean,
lastActiveWorkspace: IWorkspaceFolder | undefined,
......@@ -310,7 +310,7 @@ export function getDefaultShellArgs(
const platformKey = platformOverride === platform.Platform.Windows ? 'windows' : platformOverride === platform.Platform.Mac ? 'osx' : 'linux';
const shellArgsConfigValue = fetchSetting(`terminal.integrated.shellArgs.${platformKey}`);
let args = <string[] | string>((isWorkspaceShellAllowed ? shellArgsConfigValue.value : shellArgsConfigValue.user) || shellArgsConfigValue.default);
let args = <string[] | string>((isWorkspaceShellAllowed ? shellArgsConfigValue.value : shellArgsConfigValue.userValue) || shellArgsConfigValue.defaultValue);
if (typeof args === 'string' && platformOverride === platform.Platform.Windows) {
return configurationResolverService ? configurationResolverService.resolve(lastActiveWorkspace, args) : args;
}
......@@ -344,7 +344,7 @@ function getShellSetting(
export function createTerminalEnvironment(
shellLaunchConfig: IShellLaunchConfig,
lastActiveWorkspace: IWorkspaceFolder | null,
envFromConfig: { user?: ITerminalEnvironment, value?: ITerminalEnvironment, default?: ITerminalEnvironment },
envFromConfig: { userValue?: ITerminalEnvironment, value?: ITerminalEnvironment, defaultValue?: ITerminalEnvironment },
configurationResolverService: IConfigurationResolverService | undefined,
isWorkspaceShellAllowed: boolean,
version: string | undefined,
......@@ -362,7 +362,7 @@ export function createTerminalEnvironment(
// const platformKey = platform.isWindows ? 'windows' : (platform.isMacintosh ? 'osx' : 'linux');
// const envFromConfigValue = this._workspaceConfigurationService.inspect<ITerminalEnvironment | undefined>(`terminal.integrated.env.${platformKey}`);
const allowedEnvFromConfig = { ...(isWorkspaceShellAllowed ? envFromConfig.value : envFromConfig.user) };
const allowedEnvFromConfig = { ...(isWorkspaceShellAllowed ? envFromConfig.value : envFromConfig.userValue) };
// Resolve env vars from config and shell
if (configurationResolverService) {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或