Fixed diagnostics (#89)

editor-rs · Feb 16, 2017 · cafec86 · cafec86
1 parent 3057889
commit cafec86
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/components/cargo/diagnostic_parser.ts b/src/components/cargo/diagnostic_parser.ts
@@ -115,7 +115,11 @@ export class DiagnosticParser {
             message = `${compilerMessage.code.code}: ${message}`;
         }
 
-        this.addNotesToMessage(message, compilerMessage.children, 1);
+        if (primarySpan.label) {
+            message += `\n  label: ${primarySpan.label}`;
+        }
+
+        message = this.addNotesToMessage(message, compilerMessage.children, 1);
 
         const diagnostic = new Diagnostic(range, message, this.toSeverity(compilerMessage.level));
 
@@ -141,10 +145,10 @@ export class DiagnosticParser {
     }
 
     private addNotesToMessage(msg: string, children: any[], level: number): string {
-        const ident = '   '.repeat(level);
+        const indentation = '  '.repeat(level);
 
         for (const child of children) {
-            msg += `\n${ident}${child.message}`;
+            msg += `\n${indentation}${child.level}: ${child.message}`;
 
             if (child.spans && child.spans.length > 0) {
                 msg += ': ';