dev: ensure merge order is correct. (#2871)

streetsidesoftware · Oct 15, 2023 · fec96c5 · fec96c5
1 parent e7f6a70
commit fec96c5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/packages/_server/src/config/documentSettings.mts b/packages/_server/src/config/documentSettings.mts
@@ -332,7 +332,7 @@ export class DocumentSettings {
         const mergedSettingsFromVSCode = mergeSettings(this.importedSettings(), vscodeCSpellSettings);
         const mergedSettings = mergeSettings(
             this.defaultSettings,
-            filterMergeFields(mergedSettingsFromVSCode, !settings || vscodeCSpellSettings['mergeCSpellSettings']),
+            filterMergeFields(mergedSettingsFromVSCode, vscodeCSpellSettings['mergeCSpellSettings'] || !settings),
             settings,
         );