Merge pull request #229 from Khady/prob-matcher-409

Add support of 4.09+ multi lines errors in problem matcher
ocamllabs · May 24, 2020 · 030c505 · 030c505
2 parents 632f4e8 + ba84c68
commit 030c505
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - Add .mld syntax highlighting
 - Add highlighting for Cppo directives in OCaml files
 - Add highlighting for more toplevel and topfind directives in OCaml files
+- OCaml problem matcher now understands multi line errors emitted by 4.09 (#229)
 
 ## 0.6.1
 

diff --git a/package.json b/package.json
@@ -78,11 +78,12 @@
         ],
         "pattern": [
           {
-            "regexp": "^\\s*\\bFile\\b\\s*\"(.*)\",\\s*\\bline\\b\\s*(\\d+),\\s*\\bcharacters\\b\\s*(\\d+)-(\\d+)\\s*:\\s*$",
+            "regexp": "^\\s*\\bFile\\b\\s*\"(.*)\",\\s*\\blines?\\b\\s*(\\d+)(?:-(\\d+))?,\\s*\\bcharacters\\b\\s*(\\d+)-(\\d+)\\s*:\\s*$",
             "file": 1,
             "line": 2,
-            "column": 3,
-            "endColumn": 4
+            "endLine": 3,
+            "column": 4,
+            "endColumn": 5
           },
           {
             "regexp": "^(?:\\s*\\bParse\\b\\s*)?\\s*\\b([Ee]rror|Warning)\\b\\s*(?:\\(\\s*\\bwarning\\b\\s*(\\d+)\\))?\\s*:\\s*(.*)$",