use set instead of array

Benjamin Pasero · Benjamin Pasero · commit 0dfc47f4ef33 · 2020-01-13T12:19:08.000+01:00
diff --git a/src/vs/platform/configuration/common/configurationRegistry.ts b/src/vs/platform/configuration/common/configurationRegistry.ts
@@ -11,6 +11,7 @@ import * as types from 'vs/base/common/types';
 import * as strings from 'vs/base/common/strings';
 import { IJSONContributionRegistry, Extensions as JSONExtensions } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
 import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
+import { values } from 'vs/base/common/map';
 
 export const Extensions = {
 	Configuration: 'base.contributions.configuration'
@@ -157,7 +158,7 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 	private readonly configurationProperties: { [qualifiedKey: string]: IJSONSchema };
 	private readonly excludedConfigurationProperties: { [qualifiedKey: string]: IJSONSchema };
 	private readonly resourceLanguageSettingsSchema: IJSONSchema;
-	private readonly overrideIdentifiers: string[] = [];
+	private readonly overrideIdentifiers = new Set<string>();
 	private overridePropertyPattern: string;
 
 	private readonly _onDidSchemaChange = new Emitter<void>();
@@ -290,7 +291,10 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 	}
 
 	public registerOverrideIdentifiers(overrideIdentifiers: string[]): void {
-		this.overrideIdentifiers.push(...overrideIdentifiers);
+		for (const overrideIdentifier of overrideIdentifiers) {
+			this.overrideIdentifiers.add(overrideIdentifier);
+		}
+
 		this.updateOverridePropertyPatternKey();
 	}
 
@@ -420,7 +424,7 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 	}
 
 	private computeOverridePropertyPattern(): string {
-		return this.overrideIdentifiers.length ? OVERRIDE_PATTERN_WITH_SUBSTITUTION.replace('${0}', this.overrideIdentifiers.map(identifier => strings.createRegExp(identifier, false).source).join('|')) : OVERRIDE_PROPERTY;
+		return this.overrideIdentifiers.size > 0 ? OVERRIDE_PATTERN_WITH_SUBSTITUTION.replace('${0}', values(this.overrideIdentifiers).map(identifier => strings.createRegExp(identifier, false).source).join('|')) : OVERRIDE_PROPERTY;
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ import * as types from 'vs/base/common/types';`
`11`	`11`	`import * as strings from 'vs/base/common/strings';`
`12`	`12`	`import { IJSONContributionRegistry, Extensions as JSONExtensions } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';`
`13`	`13`	`import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';`
	`14`	`+import { values } from 'vs/base/common/map';`
`14`	`15`
`15`	`16`	`export const Extensions = {`
`16`	`17`	`Configuration: 'base.contributions.configuration'`
`@@ -157,7 +158,7 @@ class ConfigurationRegistry implements IConfigurationRegistry {`
`157`	`158`	`private readonly configurationProperties: { [qualifiedKey: string]: IJSONSchema };`
`158`	`159`	`private readonly excludedConfigurationProperties: { [qualifiedKey: string]: IJSONSchema };`
`159`	`160`	`private readonly resourceLanguageSettingsSchema: IJSONSchema;`
`160`		`- private readonly overrideIdentifiers: string[] = [];`
	`161`	`+ private readonly overrideIdentifiers = new Set<string>();`
`161`	`162`	`private overridePropertyPattern: string;`
`162`	`163`
`163`	`164`	`private readonly _onDidSchemaChange = new Emitter<void>();`
`@@ -290,7 +291,10 @@ class ConfigurationRegistry implements IConfigurationRegistry {`
`290`	`291`	`}`
`291`	`292`
`292`	`293`	`public registerOverrideIdentifiers(overrideIdentifiers: string[]): void {`
`293`		`- this.overrideIdentifiers.push(...overrideIdentifiers);`
	`294`	`+ for (const overrideIdentifier of overrideIdentifiers) {`
	`295`	`+ this.overrideIdentifiers.add(overrideIdentifier);`
	`296`	`+ }`
	`297`	`+`
`294`	`298`	`this.updateOverridePropertyPatternKey();`
`295`	`299`	`}`
`296`	`300`
`@@ -420,7 +424,7 @@ class ConfigurationRegistry implements IConfigurationRegistry {`
`420`	`424`	`}`
`421`	`425`
`422`	`426`	`private computeOverridePropertyPattern(): string {`
`423`		`- return this.overrideIdentifiers.length ? OVERRIDE_PATTERN_WITH_SUBSTITUTION.replace('${0}', this.overrideIdentifiers.map(identifier => strings.createRegExp(identifier, false).source).join('\|')) : OVERRIDE_PROPERTY;`
	`427`	`+ return this.overrideIdentifiers.size > 0 ? OVERRIDE_PATTERN_WITH_SUBSTITUTION.replace('${0}', values(this.overrideIdentifiers).map(identifier => strings.createRegExp(identifier, false).source).join('\|')) : OVERRIDE_PROPERTY;`
`424`	`428`	`}`
`425`	`429`	`}`
`426`	`430`