forked from eclipse-theia/theia
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
preferences: fix
PreferenceProvider.merge
method (eclipse-theia#12126)
Merge properties of type array when merging preferences objects.
- Loading branch information
1 parent
6091474
commit b28c8b9
Showing
2 changed files
with
39 additions
and
0 deletions.
There are no files selected for viewing
36 changes: 36 additions & 0 deletions
36
packages/core/src/browser/preferences/preference-provider.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
// ***************************************************************************** | ||
// Copyright (C) 2023 EclipseSource and others. | ||
// | ||
// This program and the accompanying materials are made available under the | ||
// terms of the Eclipse Public License v. 2.0 which is available at | ||
// http://www.eclipse.org/legal/epl-2.0. | ||
// | ||
// This Source Code may also be made available under the following Secondary | ||
// Licenses when the conditions for such availability set forth in the Eclipse | ||
// Public License v. 2.0 are satisfied: GNU General Public License, version 2 | ||
// with the GNU Classpath Exception which is available at | ||
// https://www.gnu.org/software/classpath/license.html. | ||
// | ||
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 | ||
// ***************************************************************************** | ||
|
||
import { PreferenceProvider } from './preference-provider'; | ||
const { expect } = require('chai'); | ||
|
||
describe('PreferenceProvider', () => { | ||
it('should preserve extra source fields on merge', () => { | ||
const result = PreferenceProvider.merge({ 'configurations': [], 'compounds': [] }, { 'configurations': [] }); | ||
expect(result).deep.equals({ 'configurations': [], 'compounds': [] }); | ||
}); | ||
it('should preserve extra target fields on merge', () => { | ||
const result = PreferenceProvider.merge({ 'configurations': [] }, { 'configurations': [], 'compounds': [] }); | ||
expect(result).deep.equals({ 'configurations': [], 'compounds': [] }); | ||
}); | ||
it('should merge array values', () => { | ||
const result = PreferenceProvider.merge( | ||
{ 'configurations': [{ 'name': 'test1', 'request': 'launch' }], 'compounds': [] }, | ||
{ 'configurations': [{ 'name': 'test2' }] } | ||
); | ||
expect(result).deep.equals({ 'configurations': [{ 'name': 'test1', 'request': 'launch' }, { 'name': 'test2' }], 'compounds': [] }); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters