microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-06-17 12:19:32 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge branch 'master' into referencesDogfood_1

Browse Source
This commit is contained in:
Ryan Cavanaugh
2018-04-11 16:17:38 -07:00
parent e1a50366e3 79ad7df7e1
commit df95de3231
120 changed files with 3082 additions and 1867 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/server/scriptInfo.ts
View File

@@ -395,15 +395,18 @@ namespace ts.server {
if (formatSettings) {
if (!this.formatSettings) {
this.formatSettings = getDefaultFormatCodeSettings(this.host);
assign(this.formatSettings, formatSettings);
}
else {
this.formatSettings = { ...this.formatSettings, ...formatSettings };
}
mergeMapLikes(this.formatSettings, formatSettings);
}
if (preferences) {
if (!this.preferences) {
this.preferences = clone(defaultPreferences);
this.preferences = defaultPreferences;
}
mergeMapLikes(this.preferences, preferences);
this.preferences = { ...this.preferences, ...preferences };
}
}