From 18486a02fae5966e61f16ea7bc5c33c6c7c69487 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Mon, 13 Aug 2018 13:46:05 +0300
Subject: indexing infra

---
 code/package.json     | 32 ++++++++++++++++++++++++++++++++
 code/src/extension.ts |  5 +++--
 2 files changed, 35 insertions(+), 2 deletions(-)

(limited to 'code')

diff --git a/code/package.json b/code/package.json
index eef16522f..8563ba73c 100644
--- a/code/package.json
+++ b/code/package.json
@@ -44,6 +44,38 @@
         "key": "ctrl+w",
         "when": "editorTextFocus && editorLangId == rust"
       }
+    ],
+    "problemMatchers": [
+      {
+        "name": "rustc",
+        "fileLocation": [
+          "relative",
+          "${workspaceRoot}"
+        ],
+        "pattern": [
+          {
+            "regexp": "^(warning|warn|error)(\\[(.*)\\])?: (.*)$",
+            "severity": 1,
+            "message": 4,
+            "code": 3
+          },
+          {
+            "regexp": "^([\\s->=]*(.*):(\\d*):(\\d*)|.*)$",
+            "file": 2,
+            "line": 3,
+            "column": 4
+          },
+          {
+            "regexp": "^.*$"
+          },
+          {
+            "regexp": "^([\\s->=]*(.*):(\\d*):(\\d*)|.*)$",
+            "file": 2,
+            "line": 3,
+            "column": 4
+          }
+        ]
+      }
     ]
   }
 }
diff --git a/code/src/extension.ts b/code/src/extension.ts
index 0fa092573..dd0c29f14 100644
--- a/code/src/extension.ts
+++ b/code/src/extension.ts
@@ -61,8 +61,9 @@ export function deactivate(): Thenable<void> {
 
 function startServer() {
     let run: lc.Executable = {
-        command: "m",
-        // args: ["run", "--package", "m"],
+        command: "cargo",
+        args: ["run", "--package", "m"],
+        // command: "m",
         options: { cwd: "." }
     }
     let serverOptions: lc.ServerOptions = {
-- 
cgit v1.2.3