From eed57dcded5eb661d05c23a642ca03f9b87391fa Mon Sep 17 00:00:00 2001
From: Oliver Scherer <github35764891676564198441@oli-obk.de>
Date: Sun, 15 Dec 2019 17:12:52 +0100
Subject: Add a rudimentary json regex to get at information like `endLine`

---
 editors/code/package.json | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'editors/code/package.json')

diff --git a/editors/code/package.json b/editors/code/package.json
index 43db61a8b..ebb1b4a98 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -313,6 +313,18 @@
                         "column": 3
                     }
                 ]
+            },
+            {
+                "name": "rustc-json",
+                "patterns": [{
+                    "regexp": "^.*\"message\":{\"message\":\"([^\"]*).*?\"file_name\":\"([^\"]+).*?\"line_start\":(\\d+).*?\"line_end\":(\\d+).*?\"column_start\":(\\d+).*?\"column_end\":(\\d+).*}$",
+                    "message": 1,
+                    "file": 2,
+                    "line": 3,
+                    "endLine": 4,
+                    "column": 5,
+                    "endColumn": 6
+                }]
             }
         ],
         "problemMatchers": [
@@ -324,6 +336,14 @@
                 ],
                 "pattern": "$rustc"
             },
+            {
+                "name": "rustc-json",
+                "fileLocation": [
+                    "relative",
+                    "${workspaceRoot}"
+                ],
+                "pattern": "$rustc-json"
+            },
             {
                 "name": "rustc-watch",
                 "fileLocation": [
-- 
cgit v1.2.3


From 5166f6e5f20ce807a8f41d5039d2135a7eb13d29 Mon Sep 17 00:00:00 2001
From: Oliver Scherer <github35764891676564198441@oli-obk.de>
Date: Sun, 15 Dec 2019 17:19:41 +0100
Subject: Properly format json

---
 editors/code/package.json | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'editors/code/package.json')

diff --git a/editors/code/package.json b/editors/code/package.json
index ebb1b4a98..9290599c7 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -316,15 +316,17 @@
             },
             {
                 "name": "rustc-json",
-                "patterns": [{
-                    "regexp": "^.*\"message\":{\"message\":\"([^\"]*).*?\"file_name\":\"([^\"]+).*?\"line_start\":(\\d+).*?\"line_end\":(\\d+).*?\"column_start\":(\\d+).*?\"column_end\":(\\d+).*}$",
-                    "message": 1,
-                    "file": 2,
-                    "line": 3,
-                    "endLine": 4,
-                    "column": 5,
-                    "endColumn": 6
-                }]
+                "patterns": [
+                    {
+                        "regexp": "^.*\"message\":{\"message\":\"([^\"]*).*?\"file_name\":\"([^\"]+).*?\"line_start\":(\\d+).*?\"line_end\":(\\d+).*?\"column_start\":(\\d+).*?\"column_end\":(\\d+).*}$",
+                        "message": 1,
+                        "file": 2,
+                        "line": 3,
+                        "endLine": 4,
+                        "column": 5,
+                        "endColumn": 6
+                    }
+                ]
             }
         ],
         "problemMatchers": [
-- 
cgit v1.2.3