Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

avoid object-spread in perf-critical code, use Object.assign-instead #164892

Merged
merged 1 commit into from Oct 28, 2022
Merged

avoid object-spread in perf-critical code, use Object.assign-instead #164892

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
72 changes: 33 additions & 39 deletions src/vs/workbench/services/configuration/browser/configurationService.ts
View file
Open in desktop
Expand Up @@ -1127,11 +1127,11 @@ class RegisterConfigurationSchemasContribution extends Disposable implements IWo

const userSettingsSchema: IJSONSchema = this.environmentService.remoteAuthority ?
{
properties: {
...applicationSettings.properties,
...windowSettings.properties,
...resourceSettings.properties
},
properties: Object.assign({},
applicationSettings.properties,
windowSettings.properties,
resourceSettings.properties
),
patternProperties: allSettings.patternProperties,
additionalProperties: true,
allowTrailingCommas: true,
Expand All @@ -1140,37 +1140,37 @@ class RegisterConfigurationSchemasContribution extends Disposable implements IWo
: allSettingsSchema;

const profileSettingsSchema: IJSONSchema = {
properties: {
...machineSettings.properties,
...machineOverridableSettings.properties,
...windowSettings.properties,
...resourceSettings.properties
},
properties: Object.assign({},
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
},
properties: Object.assign({},
machineSettings.properties,
machineOverridableSettings.properties,
windowSettings.properties,
resourceSettings.properties
),
patternProperties: allSettings.patternProperties,
additionalProperties: true,
allowTrailingCommas: true,
allowComments: true
};

const workspaceSettingsSchema: IJSONSchema = {
properties: {
...this.checkAndFilterPropertiesRequiringTrust(machineOverridableSettings.properties),
...this.checkAndFilterPropertiesRequiringTrust(windowSettings.properties),
...this.checkAndFilterPropertiesRequiringTrust(resourceSettings.properties)
},
properties: Object.assign({},
this.checkAndFilterPropertiesRequiringTrust(machineOverridableSettings.properties),
this.checkAndFilterPropertiesRequiringTrust(windowSettings.properties),
this.checkAndFilterPropertiesRequiringTrust(resourceSettings.properties)
),
patternProperties: allSettings.patternProperties,
additionalProperties: true,
allowTrailingCommas: true,
Expand All @@ -1179,17 +1179,11 @@ class RegisterConfigurationSchemasContribution extends Disposable implements IWo

jsonRegistry.registerSchema(defaultSettingsSchemaId, {
properties: Object.keys(allSettings.properties).reduce<IJSONSchemaMap>((result, key) => {
result[key] = {
...allSettings.properties[key],
deprecationMessage: undefined
};
result[key] = Object.assign({ deprecationMessage: undefined }, allSettings.properties[key]);
return result;
}, {}),
patternProperties: Object.keys(allSettings.patternProperties).reduce<IJSONSchemaMap>((result, key) => {
result[key] = {
...allSettings.patternProperties[key],
deprecationMessage: undefined
};
result[key] = Object.assign({ deprecationMessage: undefined }, allSettings.patternProperties[key]);
return result;
}, {}),
additionalProperties: true,
Expand All @@ -1202,10 +1196,10 @@ class RegisterConfigurationSchemasContribution extends Disposable implements IWo

if (WorkbenchState.WORKSPACE === this.workspaceContextService.getWorkbenchState()) {
const folderSettingsSchema: IJSONSchema = {
properties: {
...this.checkAndFilterPropertiesRequiringTrust(machineOverridableSettings.properties),
...this.checkAndFilterPropertiesRequiringTrust(resourceSettings.properties)
},
properties: Object.assign({},
this.checkAndFilterPropertiesRequiringTrust(machineOverridableSettings.properties),
this.checkAndFilterPropertiesRequiringTrust(resourceSettings.properties)
),
patternProperties: allSettings.patternProperties,
additionalProperties: true,
allowTrailingCommas: true,
Expand All @@ -1221,11 +1215,11 @@ class RegisterConfigurationSchemasContribution extends Disposable implements IWo
jsonRegistry.registerSchema(configurationDefaultsSchemaId, {
type: 'object',
description: localize('configurationDefaults.description', 'Contribute defaults for configurations'),
properties: {
...machineOverridableSettings.properties,
...windowSettings.properties,
...resourceSettings.properties
},
properties: Object.assign({},
machineOverridableSettings.properties,
windowSettings.properties,
resourceSettings.properties
),
patternProperties: {
[OVERRIDE_PROPERTY_PATTERN]: {
type: 'object',
Expand Down