aboutsummaryrefslogtreecommitdiff
path: root/code
diff options
context:
space:
mode:
Diffstat (limited to 'code')
-rw-r--r--code/package.json32
-rw-r--r--code/src/extension.ts5
2 files changed, 35 insertions, 2 deletions
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 @@
44 "key": "ctrl+w", 44 "key": "ctrl+w",
45 "when": "editorTextFocus && editorLangId == rust" 45 "when": "editorTextFocus && editorLangId == rust"
46 } 46 }
47 ],
48 "problemMatchers": [
49 {
50 "name": "rustc",
51 "fileLocation": [
52 "relative",
53 "${workspaceRoot}"
54 ],
55 "pattern": [
56 {
57 "regexp": "^(warning|warn|error)(\\[(.*)\\])?: (.*)$",
58 "severity": 1,
59 "message": 4,
60 "code": 3
61 },
62 {
63 "regexp": "^([\\s->=]*(.*):(\\d*):(\\d*)|.*)$",
64 "file": 2,
65 "line": 3,
66 "column": 4
67 },
68 {
69 "regexp": "^.*$"
70 },
71 {
72 "regexp": "^([\\s->=]*(.*):(\\d*):(\\d*)|.*)$",
73 "file": 2,
74 "line": 3,
75 "column": 4
76 }
77 ]
78 }
47 ] 79 ]
48 } 80 }
49} 81}
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> {
61 61
62function startServer() { 62function startServer() {
63 let run: lc.Executable = { 63 let run: lc.Executable = {
64 command: "m", 64 command: "cargo",
65 // args: ["run", "--package", "m"], 65 args: ["run", "--package", "m"],
66 // command: "m",
66 options: { cwd: "." } 67 options: { cwd: "." }
67 } 68 }
68 let serverOptions: lc.ServerOptions = { 69 let serverOptions: lc.ServerOptions = {