Skip to content

Commit

Permalink
fix: don't lose default settings from Code if v1 exists
Browse files Browse the repository at this point in the history
  • Loading branch information
wkillerud committed Sep 25, 2024
1 parent 37c71fa commit c12b8ee
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion packages/language-server/src/configuration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
export function toNewConfiguration(
v1: Partial<ConfigurationV1>,
): LanguageServiceConfiguration {
const newSettings = Object.assign({}, defaultConfiguration);
const newSettings = Object.assign({}, defaultConfiguration, v1);
if (v1.loadPaths) newSettings.workspace.loadPaths = v1.loadPaths;
if (v1.scannerExclude) newSettings.workspace.exclude = v1.scannerExclude;

Expand Down

0 comments on commit c12b8ee

Please sign in to comment.