Skip to content

Commit a3b9735

Browse files
Revert "preferences: fix PreferenceProvider.merge method (#12126)" (#12213)
This reverts commit b28c8b9.
1 parent 8cd563e commit a3b9735

File tree

3 files changed

+1
-40
lines changed

3 files changed

+1
-40
lines changed

examples/api-tests/src/launch-preferences.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
* Expectations should be tested and aligned against VS Code.
2626
* See https://github.com/akosyakov/vscode-launch/blob/master/src/test/extension.test.ts
2727
*/
28-
describe.skip('Launch Preferences', function () {
28+
describe('Launch Preferences', function () {
2929
this.timeout(10_000);
3030

3131
const { assert } = chai;

packages/core/src/browser/preferences/preference-provider.spec.ts

-36
This file was deleted.

packages/core/src/browser/preferences/preference-provider.ts

-3
Original file line numberDiff line numberDiff line change
@@ -235,9 +235,6 @@ export abstract class PreferenceProvider implements Disposable {
235235
if (JSONExt.isObject(source[key]) && JSONExt.isObject(value)) {
236236
this.merge(source[key], value);
237237
continue;
238-
} else if (JSONExt.isArray(source[key]) && JSONExt.isArray(value)) {
239-
source[key] = [...JSONExt.deepCopy(source[key] as any), ...JSONExt.deepCopy(value)];
240-
continue;
241238
}
242239
}
243240
source[key] = JSONExt.deepCopy(value);

0 commit comments

Comments
 (0)