Merge branch 'master' into map4

This commit is contained in:
Andy Hanson committed 2016-10-17 06:49:53 -07:00
commit 7292f9f67e
336 files changed
+35313 -16147

No files matched your search

+1 -1
View File
@@ -91,7 +91,7 @@ namespace ts.server {
return this.containingProjects[0];
}
setFormatOptions(formatSettings: protocol.FormatOptions): void {
setFormatOptions(formatSettings: FormatCodeSettings): void {
if (formatSettings) {
if (!this.formatCodeSettings) {
this.formatCodeSettings = getDefaultFormatCodeSettings(this.host);