Add support for leading '>' in structured diagnostic messages. (#47)

* Add support for leading '>' in structured diagnostic messages. * added support for structured errors to the log regex Co-authored-by: quantimnot <[email protected]>
saem · Jul 10, 2021 · 13e4fc1 · 13e4fc1
1 parent babec4d
commit 13e4fc1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -99,12 +99,12 @@
                 "fileLocation": "absolute",
                 "severity": "error",
                 "pattern": {
-                    "regexp": "(?!^(\\.+|Hint|\\s+$))(.*)\\((\\d+),\\s(\\d+)\\)\\s+((Error|Warning|Hint):\\s(.*)|(template/generic instantiation from here.*))(\\s\\[.*\\])?",
-                    "file": 2,
-                    "line": 3,
-                    "column": 4,
-                    "severity": 6,
-                    "message": 7
+                    "regexp": "(?!^(\\.+|Hint|\\s+$))(>+ )?(.*)\\((\\d+),\\s(\\d+)\\)\\s+((Error|Warning|Hint):\\s(.*)|(template/generic instantiation from here.*))(\\s\\[.*\\])?",
+                    "file": 3,
+                    "line": 4,
+                    "column": 5,
+                    "severity": 7,
+                    "message": 8
                 }
             },
             {

diff --git a/src/nimvscode/nimBuild.nim b/src/nimvscode/nimBuild.nim
@@ -135,18 +135,18 @@ proc parseErrors(lines: seq[cstring]): seq[CheckResult] =
     if line.startsWith("Hint:") or line == "" or dots.test(line):
       continue
 
-    let match = newRegExp(r"^([^(]*)?\((\d+)(,\s(\d+))?\)( (\w+):)? (.*)")
+    let match = newRegExp(r"^(>+ )?([^(]*)?\((\d+)(,\s(\d+))?\)( (\w+):)? (.*)")
       .exec(line)
     if not match.toJs().to(bool):
       if messageText.len < 1024:
         messageText &= nodeOs.eol & line
     else:
       let
-        file = match[1]
-        lineStr = match[2]
-        charStr = match[4]
-        severity = match[6]
-        msg = match[7]
+        file = match[2]
+        lineStr = match[3]
+        charStr = match[5]
+        severity = match[7]
+        msg = match[8]
 
       if severity == nil:
         stacktrace.add(CheckStacktrace(