🐛 Use core.merge to merge config + overrides

SpyglassMC · Jul 13, 2024 · 81e4dbc · 81e4dbc
1 parent 983a433
commit 81e4dbc
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 45 deletions.
diff --git a/__snapshots__/packages/core/test-out/service/Config.spec.js b/__snapshots__/packages/core/test-out/service/Config.spec.js
diff --git a/packages/core/src/service/Config.ts b/packages/core/src/service/Config.ts
@@ -1,6 +1,6 @@
 import rfdc from 'rfdc'
 import type { ExternalEventEmitter } from '../common/index.js'
-import { Arrayable, bufferToString, TypePredicates } from '../common/index.js'
+import { Arrayable, bufferToString, merge, TypePredicates } from '../common/index.js'
 import { ErrorSeverity } from '../source/index.js'
 import { FileCategories, RegistryCategories } from '../symbol/index.js'
 import type { Project } from './Project.js'
@@ -493,13 +493,6 @@ export class ConfigService implements ExternalEventEmitter {
 	}
 
 	public static merge(base: Config, ...overrides: any[]): Config {
-		// FIXME
-		const ans = rfdc()(base)
-		for (const override of overrides) {
-			for (const key of ['env', 'format', 'lint', 'snippet'] as const) {
-				ans[key] = { ...ans[key], ...override[key] } as any
-			}
-		}
-		return ans
+		return overrides.reduce(merge, rfdc()(base))
 	}
 }