1 files changed, 29 insertions, 2 deletions

diff --git a/editors/code/package.json b/editors/code/package.json
index 93a1d6d01..e0db3c337 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -147,6 +147,7 @@
         },
         "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": [
                     {
@@ -171,7 +172,20 @@
                     "relative",
                     "${workspaceRoot}"
                 ],
-                "pattern": "$rustc"
+                "pattern": [
+                    {
+                        "regexp": "^(warning|warn|error)(?:\\[(.*?)\\])?: (.*)$",
+                        "severity": 1,
+                        "code": 2,
+                        "message": 3
+                    },
+                    {
+                        "regexp": "^[\\s->=]*(.*?):(\\d*):(\\d*)\\s*$",
+                        "file": 1,
+                        "line": 2,
+                        "column": 3
+                    }
+                ]
             },
             {
                 "name": "rustc-watch",
@@ -183,7 +197,20 @@
                     "beginsPattern": "^\\[Running ",
                     "endsPattern": "^(\\[Finished running\\]|To learn more, run the command again with --verbose\\.)$"
                 },
-                "pattern": "$rustc"
+                "pattern": [
+                    {
+                        "regexp": "^(warning|warn|error)(?:\\[(.*?)\\])?: (.*)$",
+                        "severity": 1,
+                        "code": 2,
+                        "message": 3
+                    },
+                    {
+                        "regexp": "^[\\s->=]*(.*?):(\\d*):(\\d*)\\s*$",
+                        "file": 1,
+                        "line": 2,
+                        "column": 3
+                    }
+                ]
             }
         ]
     }