mirror of
https://github.com/Microsoft/vscode
synced 2024-10-12 14:30:13 +00:00
fix #103009
This commit is contained in:
parent
6648df13dd
commit
080eae73cd
|
@ -54,7 +54,7 @@
|
||||||
"url": "vscode://schemas/keybindings"
|
"url": "vscode://schemas/keybindings"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fileMatch": "vscode://defaultsettings/*/*.json",
|
"fileMatch": "vscode://defaultsettings/defaultSettings.json",
|
||||||
"url": "vscode://schemas/settings/default"
|
"url": "vscode://schemas/settings/default"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -527,12 +527,13 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
|
||||||
private registerConfigurationSchemas(): void {
|
private registerConfigurationSchemas(): void {
|
||||||
if (this.workspace) {
|
if (this.workspace) {
|
||||||
const jsonRegistry = Registry.as<IJSONContributionRegistry>(JSONExtensions.JSONContribution);
|
const jsonRegistry = Registry.as<IJSONContributionRegistry>(JSONExtensions.JSONContribution);
|
||||||
|
const defaultSettingsSchema: IJSONSchema = { additionalProperties: true, allowTrailingCommas: true, allowComments: true };
|
||||||
const allSettingsSchema: IJSONSchema = { properties: allSettings.properties, patternProperties: allSettings.patternProperties, additionalProperties: true, allowTrailingCommas: true, allowComments: true };
|
const allSettingsSchema: IJSONSchema = { properties: allSettings.properties, patternProperties: allSettings.patternProperties, additionalProperties: true, allowTrailingCommas: true, allowComments: true };
|
||||||
const userSettingsSchema: IJSONSchema = this.remoteUserConfiguration ? { properties: { ...applicationSettings.properties, ...windowSettings.properties, ...resourceSettings.properties }, patternProperties: allSettings.patternProperties, additionalProperties: true, allowTrailingCommas: true, allowComments: true } : allSettingsSchema;
|
const userSettingsSchema: IJSONSchema = this.remoteUserConfiguration ? { properties: { ...applicationSettings.properties, ...windowSettings.properties, ...resourceSettings.properties }, patternProperties: allSettings.patternProperties, additionalProperties: true, allowTrailingCommas: true, allowComments: true } : allSettingsSchema;
|
||||||
const machineSettingsSchema: IJSONSchema = { properties: { ...machineSettings.properties, ...machineOverridableSettings.properties, ...windowSettings.properties, ...resourceSettings.properties }, patternProperties: allSettings.patternProperties, additionalProperties: true, allowTrailingCommas: true, allowComments: true };
|
const machineSettingsSchema: IJSONSchema = { properties: { ...machineSettings.properties, ...machineOverridableSettings.properties, ...windowSettings.properties, ...resourceSettings.properties }, patternProperties: allSettings.patternProperties, additionalProperties: true, allowTrailingCommas: true, allowComments: true };
|
||||||
const workspaceSettingsSchema: IJSONSchema = { properties: { ...machineOverridableSettings.properties, ...windowSettings.properties, ...resourceSettings.properties }, patternProperties: allSettings.patternProperties, additionalProperties: true, allowTrailingCommas: true, allowComments: true };
|
const workspaceSettingsSchema: IJSONSchema = { properties: { ...machineOverridableSettings.properties, ...windowSettings.properties, ...resourceSettings.properties }, patternProperties: allSettings.patternProperties, additionalProperties: true, allowTrailingCommas: true, allowComments: true };
|
||||||
|
|
||||||
jsonRegistry.registerSchema(defaultSettingsSchemaId, allSettingsSchema);
|
jsonRegistry.registerSchema(defaultSettingsSchemaId, defaultSettingsSchema);
|
||||||
jsonRegistry.registerSchema(userSettingsSchemaId, userSettingsSchema);
|
jsonRegistry.registerSchema(userSettingsSchemaId, userSettingsSchema);
|
||||||
jsonRegistry.registerSchema(machineSettingsSchemaId, machineSettingsSchema);
|
jsonRegistry.registerSchema(machineSettingsSchemaId, machineSettingsSchema);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue