From f626733c4ae3940c820fc76e8eb845ff4888943f Mon Sep 17 00:00:00 2001
From: kjeremy <kjeremy@gmail.com>
Date: Mon, 18 Feb 2019 13:12:54 -0500
Subject: Use named multiline Problem Matcher

Now that https://github.com/Microsoft/vscode/pull/65840 is in the latest
release we can use the first commit from https://github.com/rust-analyzer/rust-analyzer/pull/408
---
 editors/code/package.json | 31 ++-----------------------------
 1 file changed, 2 insertions(+), 29 deletions(-)

(limited to 'editors/code')

diff --git a/editors/code/package.json b/editors/code/package.json
index 4fc2cb754..caec5a418 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -177,7 +177,6 @@
         },
         "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": [
                     {
@@ -202,20 +201,7 @@
                     "relative",
                     "${workspaceRoot}"
                 ],
-                "pattern": [
-                    {
-                        "regexp": "^(warning|warn|error)(?:\\[(.*?)\\])?: (.*)$",
-                        "severity": 1,
-                        "code": 2,
-                        "message": 3
-                    },
-                    {
-                        "regexp": "^[\\s->=]*(.*?):(\\d*):(\\d*)\\s*$",
-                        "file": 1,
-                        "line": 2,
-                        "column": 3
-                    }
-                ]
+                "pattern": "$rustc"
             },
             {
                 "name": "rustc-watch",
@@ -227,20 +213,7 @@
                     "beginsPattern": "^\\[Running ",
                     "endsPattern": "^(\\[Finished running\\]|To learn more, run the command again with --verbose\\.)$"
                 },
-                "pattern": [
-                    {
-                        "regexp": "^(warning|warn|error)(?:\\[(.*?)\\])?: (.*)$",
-                        "severity": 1,
-                        "code": 2,
-                        "message": 3
-                    },
-                    {
-                        "regexp": "^[\\s->=]*(.*?):(\\d*):(\\d*)\\s*$",
-                        "file": 1,
-                        "line": 2,
-                        "column": 3
-                    }
-                ]
+                "pattern": "$rustc"
             }
         ]
     }
-- 
cgit v1.2.3