Revert "preferences: fix PreferenceProvider.merge method (#12126)" (#…

…12213) This reverts commit b28c8b9.
eclipse-theia · Feb 23, 2023 · a3b9735 · a3b9735
1 parent 8cd563e
commit a3b9735
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 40 deletions.
diff --git a/examples/api-tests/src/launch-preferences.spec.js b/examples/api-tests/src/launch-preferences.spec.js
@@ -25,7 +25,7 @@
  * Expectations should be tested and aligned against VS Code.
  * See https://github.com/akosyakov/vscode-launch/blob/master/src/test/extension.test.ts
  */
-describe.skip('Launch Preferences', function () {
+describe('Launch Preferences', function () {
     this.timeout(10_000);
 
     const { assert } = chai;

diff --git a/packages/core/src/browser/preferences/preference-provider.spec.ts b/packages/core/src/browser/preferences/preference-provider.spec.ts
diff --git a/packages/core/src/browser/preferences/preference-provider.ts b/packages/core/src/browser/preferences/preference-provider.ts
@@ -235,9 +235,6 @@ export abstract class PreferenceProvider implements Disposable {
                 if (JSONExt.isObject(source[key]) && JSONExt.isObject(value)) {
                     this.merge(source[key], value);
                     continue;
-                } else if (JSONExt.isArray(source[key]) && JSONExt.isArray(value)) {
-                    source[key] = [...JSONExt.deepCopy(source[key] as any), ...JSONExt.deepCopy(value)];
-                    continue;
                 }
             }
             source[key] = JSONExt.deepCopy(value);