Merge pull request microsoft#15283 from Microsoft/Fix15237

mhegazy · web-flow · commit 0736d8e3d0a8 · 2017-04-20T14:20:13.000-07:00
Return Diagnostic.category from the server
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -3350,6 +3350,7 @@ namespace ts {
         messageText: string | DiagnosticMessageChain;
         category: DiagnosticCategory;
         code: number;
+        source?: string;
     }
 
     export enum DiagnosticCategory {
diff --git a/src/server/protocol.ts b/src/server/protocol.ts
@@ -1824,10 +1824,20 @@ namespace ts.server.protocol {
          */
         text: string;
 
+        /**
+         * The category of the diagnostic message, e.g. "error" vs. "warning"
+         */
+        category: string;
+
         /**
          * The error code of the diagnostic message.
          */
         code?: number;
+
+        /**
+         * The name of the plugin reporting the message.
+         */
+        source?: string;
     }
 
     export interface DiagnosticEventBody {
diff --git a/src/server/session.ts b/src/server/session.ts
@@ -78,15 +78,19 @@ namespace ts.server {
             start: scriptInfo.positionToLineOffset(diag.start),
             end: scriptInfo.positionToLineOffset(diag.start + diag.length),
             text: ts.flattenDiagnosticMessageText(diag.messageText, "\n"),
-            code: diag.code
+            code: diag.code,
+            category: DiagnosticCategory[diag.category].toLowerCase(),
+            source: diag.source
         };
     }
 
     function formatConfigFileDiag(diag: ts.Diagnostic): protocol.Diagnostic {
         return {
             start: undefined,
             end: undefined,
-            text: ts.flattenDiagnosticMessageText(diag.messageText, "\n")
+            text: ts.flattenDiagnosticMessageText(diag.messageText, "\n"),
+            category: DiagnosticCategory[diag.category].toLowerCase(),
+            source: diag.source
         };
     }
 
@@ -601,6 +605,7 @@ namespace ts.server {
                 length: d.length,
                 category: DiagnosticCategory[d.category].toLowerCase(),
                 code: d.code,
+                source: d.source,
                 startLocation: scriptInfo && scriptInfo.positionToLineOffset(d.start),
                 endLocation: scriptInfo && scriptInfo.positionToLineOffset(d.start + d.length)
             });

Original file line number	Diff line number	Diff line change
`@@ -3350,6 +3350,7 @@ namespace ts {`
`3350`	`3350`	`messageText: string \| DiagnosticMessageChain;`
`3351`	`3351`	`category: DiagnosticCategory;`
`3352`	`3352`	`code: number;`
	`3353`	`+ source?: string;`
`3353`	`3354`	`}`
`3354`	`3355`
`3355`	`3356`	`export enum DiagnosticCategory {`