development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 04:49:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #177142 (#186495)

Browse source
This commit is contained in:
Sandeep Somavarapu 2023-06-28 14:42:45 +02:00 committed by GitHub
parent 4b0d4241ec
commit f5e6325900
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 44 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
src/vs/workbench/services/configuration/browser/configurationService.ts
View file

@ -1090,6 +1090,16 @@ class RegisterConfigurationSchemasContribution extends Disposable implements IWo
) {
super();
this.registerSchemas({
defaultSettingsSchema: {},
userSettingsSchema: {},
profileSettingsSchema: {},
machineSettingsSchema: {},
workspaceSettingsSchema: {},
folderSettingsSchema: {},
configDefaultsSchema: {},
});
extensionService.whenInstalledExtensionsRegistered().then(() => {
this.registerConfigurationSchemas();
@ -1101,8 +1111,6 @@ class RegisterConfigurationSchemasContribution extends Disposable implements IWo
}
private registerConfigurationSchemas(): void {
const jsonRegistry = Registry.as<IJSONContributionRegistry>(JSONExtensions.JSONContribution);
const allSettingsSchema: IJSONSchema = {
properties: allSettings.properties,
patternProperties: allSettings.patternProperties,
@ -1163,7 +1171,7 @@ class RegisterConfigurationSchemasContribution extends Disposable implements IWo
allowComments: true
};
jsonRegistry.registerSchema(defaultSettingsSchemaId, {
const defaultSettingsSchema = {
properties: Object.keys(allSettings.properties).reduce<IJSONSchemaMap>((result, key) => {
result[key] = Object.assign({ deprecationMessage: undefined }, allSettings.properties[key]);
return result;
@ -1175,13 +1183,10 @@ class RegisterConfigurationSchemasContribution extends Disposable implements IWo
additionalProperties: true,
allowTrailingCommas: true,
allowComments: true
});
jsonRegistry.registerSchema(userSettingsSchemaId, userSettingsSchema);
jsonRegistry.registerSchema(profileSettingsSchemaId, profileSettingsSchema);
jsonRegistry.registerSchema(machineSettingsSchemaId, machineSettingsSchema);
};
if (WorkbenchState.WORKSPACE === this.workspaceContextService.getWorkbenchState()) {
const folderSettingsSchema: IJSONSchema = {
const folderSettingsSchema: IJSONSchema = WorkbenchState.WORKSPACE === this.workspaceContextService.getWorkbenchState() ?
{
properties: Object.assign({},
this.checkAndFilterPropertiesRequiringTrust(machineOverridableSettings.properties),
this.checkAndFilterPropertiesRequiringTrust(resourceSettings.properties)
@ -1190,15 +1195,9 @@ class RegisterConfigurationSchemasContribution extends Disposable implements IWo
additionalProperties: true,
allowTrailingCommas: true,
allowComments: true
};
jsonRegistry.registerSchema(workspaceSettingsSchemaId, workspaceSettingsSchema);
jsonRegistry.registerSchema(folderSettingsSchemaId, folderSettingsSchema);
} else {
jsonRegistry.registerSchema(workspaceSettingsSchemaId, workspaceSettingsSchema);
jsonRegistry.registerSchema(folderSettingsSchemaId, workspaceSettingsSchema);
}
} : workspaceSettingsSchema;
jsonRegistry.registerSchema(configurationDefaultsSchemaId, {
const configDefaultsSchema: IJSONSchema = {
type: 'object',
description: localize('configurationDefaults.description', 'Contribute defaults for configurations'),
properties: Object.assign({},
@ -1214,9 +1213,37 @@ class RegisterConfigurationSchemasContribution extends Disposable implements IWo
}
},
additionalProperties: false
};
this.registerSchemas({
defaultSettingsSchema,
userSettingsSchema,
profileSettingsSchema,
machineSettingsSchema,
workspaceSettingsSchema,
folderSettingsSchema,
configDefaultsSchema,
});
}
private registerSchemas(schemas: {
defaultSettingsSchema: IJSONSchema;
userSettingsSchema: IJSONSchema;
profileSettingsSchema: IJSONSchema;
machineSettingsSchema: IJSONSchema;
workspaceSettingsSchema: IJSONSchema;
folderSettingsSchema: IJSONSchema;
configDefaultsSchema: IJSONSchema;
}): void {
const jsonRegistry = Registry.as<IJSONContributionRegistry>(JSONExtensions.JSONContribution);
jsonRegistry.registerSchema(defaultSettingsSchemaId, schemas.defaultSettingsSchema);
jsonRegistry.registerSchema(userSettingsSchemaId, schemas.userSettingsSchema);
jsonRegistry.registerSchema(profileSettingsSchemaId, schemas.profileSettingsSchema);
jsonRegistry.registerSchema(machineSettingsSchemaId, schemas.machineSettingsSchema);
jsonRegistry.registerSchema(workspaceSettingsSchemaId, schemas.workspaceSettingsSchema);
jsonRegistry.registerSchema(folderSettingsSchemaId, schemas.folderSettingsSchema);
jsonRegistry.registerSchema(configurationDefaultsSchemaId, schemas.configDefaultsSchema);
}
private checkAndFilterPropertiesRequiringTrust(properties: IStringDictionary<IConfigurationPropertySchema>): IStringDictionary<IConfigurationPropertySchema> {
if (this.workspaceTrustManagementService.isWorkspaceTrusted()) {
return properties;