1 files changed, 50 insertions, 14 deletions

diff --git a/editors/code/package.json b/editors/code/package.json
index 2989a7016..e0db3c337 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -145,6 +145,26 @@
                 }
             }
         },
+        "problemPatterns": [
+            {
+                "//comment": "named multiline problem patterns are not parsed properly in vscode at the moment, when fixed in vscode replace both \"pattern\": [...] below with \"pattern\": \"$rustc\"",
+                "name": "rustc",
+                "patterns": [
+                    {
+                        "regexp": "^(warning|warn|error)(?:\\[(.*?)\\])?: (.*)$",
+                        "severity": 1,
+                        "code": 2,
+                        "message": 3
+                    },
+                    {
+                        "regexp": "^[\\s->=]*(.*?):(\\d*):(\\d*)\\s*$",
+                        "file": 1,
+                        "line": 2,
+                        "column": 3
+                    }
+                ]
+            }
+        ],
         "problemMatchers": [
             {
                 "name": "rustc",
@@ -154,28 +174,44 @@
                 ],
                 "pattern": [
                     {
-                        "regexp": "^(warning|warn|error)(\\[(.*)\\])?: (.*)$",
+                        "regexp": "^(warning|warn|error)(?:\\[(.*?)\\])?: (.*)$",
                         "severity": 1,
-                        "message": 4,
-                        "code": 3
+                        "code": 2,
+                        "message": 3
                     },
                     {
-                        "regexp": "^([\\s->=]*(.*):(\\d*):(\\d*)|.*)$",
-                        "file": 2,
-                        "line": 3,
-                        "column": 4
-                    },
+                        "regexp": "^[\\s->=]*(.*?):(\\d*):(\\d*)\\s*$",
+                        "file": 1,
+                        "line": 2,
+                        "column": 3
+                    }
+                ]
+            },
+            {
+                "name": "rustc-watch",
+                "fileLocation": [
+                    "relative",
+                    "${workspaceRoot}"
+                ],
+                "background": {
+                    "beginsPattern": "^\\[Running ",
+                    "endsPattern": "^(\\[Finished running\\]|To learn more, run the command again with --verbose\\.)$"
+                },
+                "pattern": [
                     {
-                        "regexp": "^.*$"
+                        "regexp": "^(warning|warn|error)(?:\\[(.*?)\\])?: (.*)$",
+                        "severity": 1,
+                        "code": 2,
+                        "message": 3
                     },
                     {
-                        "regexp": "^([\\s->=]*(.*):(\\d*):(\\d*)|.*)$",
-                        "file": 2,
-                        "line": 3,
-                        "column": 4
+                        "regexp": "^[\\s->=]*(.*?):(\\d*):(\\d*)\\s*$",
+                        "file": 1,
+                        "line": 2,
+                        "column": 3
                     }
                 ]
             }
         ]
     }
-}
+}
\ No newline at end of file