From 55e99a5b77cc7449e32832e1ea2a00da3762961c Mon Sep 17 00:00:00 2001 From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com> Date: Fri, 23 Jun 2023 14:57:24 -0700 Subject: [PATCH 1/2] Directly compare first element --- src/vs/platform/configuration/common/configurationModels.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/platform/configuration/common/configurationModels.ts b/src/vs/platform/configuration/common/configurationModels.ts index f05974df9ef..2a092978e01 100644 --- a/src/vs/platform/configuration/common/configurationModels.ts +++ b/src/vs/platform/configuration/common/configurationModels.ts @@ -211,7 +211,7 @@ export class ConfigurationModel implements IConfigurationModel { } }; for (const override of this.overrides) { - if (arrays.equals(override.identifiers, [identifier])) { + if (override.identifiers[0] === identifier) { contentsForIdentifierOnly = override.contents; } else if (override.identifiers.includes(identifier)) { mergeContents(override.contents); From f444d09fd3fe4354cc4d0af6b02a2c0af4c2221d Mon Sep 17 00:00:00 2001 From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com> Date: Fri, 23 Jun 2023 15:02:28 -0700 Subject: [PATCH 2/2] Add len check in case there is more than one id --- src/vs/platform/configuration/common/configurationModels.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/platform/configuration/common/configurationModels.ts b/src/vs/platform/configuration/common/configurationModels.ts index 2a092978e01..9e171f9b6cb 100644 --- a/src/vs/platform/configuration/common/configurationModels.ts +++ b/src/vs/platform/configuration/common/configurationModels.ts @@ -211,7 +211,7 @@ export class ConfigurationModel implements IConfigurationModel { } }; for (const override of this.overrides) { - if (override.identifiers[0] === identifier) { + if (override.identifiers.length === 1 && override.identifiers[0] === identifier) { contentsForIdentifierOnly = override.contents; } else if (override.identifiers.includes(identifier)) { mergeContents(override.contents);