Merge pull request #12864 from Microsoft/mergeMaster1212

Merge master 12/12
This commit is contained in:
Mohamed Hegazy
2016-12-12 16:13:07 -08:00
committed by GitHub
253 changed files with 4753 additions and 2344 deletions
+10 -1
View File
@@ -1,4 +1,4 @@
/**
/**
* Declaration module describing the TypeScript Server protocol
*/
namespace ts.server.protocol {
@@ -918,6 +918,10 @@ namespace ts.server.protocol {
* List of removed files
*/
removed: string[];
/**
* List of updated files
*/
updated: string[];
}
/**
@@ -990,6 +994,11 @@ namespace ts.server.protocol {
* The format options to use during formatting and other code editing features.
*/
formatOptions?: FormatCodeSettings;
/**
* The host's additional supported file extensions
*/
extraFileExtensions?: FileExtensionInfo[];
}
/**