diff options
| -rw-r--r-- | .vscode/tasks.json | 55 | ||||
| -rw-r--r-- | editors/code/package.json | 4 |
2 files changed, 36 insertions, 23 deletions
diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 045cee326..063cbd174 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json | |||
| @@ -10,7 +10,10 @@ | |||
| 10 | "problemMatcher": { | 10 | "problemMatcher": { |
| 11 | "owner": "typescript", | 11 | "owner": "typescript", |
| 12 | "pattern": "$tsc", | 12 | "pattern": "$tsc", |
| 13 | "fileLocation": ["relative", "${workspaceRoot}/editors/code"] | 13 | "fileLocation": [ |
| 14 | "relative", | ||
| 15 | "${workspaceRoot}/editors/code" | ||
| 16 | ] | ||
| 14 | }, | 17 | }, |
| 15 | "path": "editors/code/" | 18 | "path": "editors/code/" |
| 16 | }, | 19 | }, |
| @@ -18,30 +21,40 @@ | |||
| 18 | "label": "Build Lsp", | 21 | "label": "Build Lsp", |
| 19 | "type": "shell", | 22 | "type": "shell", |
| 20 | "command": "cargo build", | 23 | "command": "cargo build", |
| 21 | "problemMatcher": { | 24 | "problemMatcher": "$rustc" |
| 22 | "owner": "rust", | ||
| 23 | "fileLocation": ["relative", "${workspaceRoot}"], | ||
| 24 | "pattern": [ | ||
| 25 | { | ||
| 26 | "regexp": "^(warning|warn|error)(?:\\[(.*?)\\])?: (.*)$", | ||
| 27 | "severity": 1, | ||
| 28 | "code": 2, | ||
| 29 | "message": 3 | ||
| 30 | }, | ||
| 31 | { | ||
| 32 | "regexp": "^[\\s->=]*(.*?):(\\d*):(\\d*)\\s*$", | ||
| 33 | "file": 1, | ||
| 34 | "line": 2, | ||
| 35 | "column": 3 | ||
| 36 | } | ||
| 37 | ] | ||
| 38 | } | ||
| 39 | }, | 25 | }, |
| 40 | { | 26 | { |
| 41 | "label": "Build All", | 27 | "label": "Build All", |
| 42 | "group": "build", | 28 | "group": "build", |
| 43 | "dependsOn": ["Build Extension", "Build Lsp"], | 29 | "dependsOn": [ |
| 30 | "Build Extension", | ||
| 31 | "Build Lsp" | ||
| 32 | ], | ||
| 44 | "problemMatcher": [] | 33 | "problemMatcher": [] |
| 34 | }, | ||
| 35 | { | ||
| 36 | "label": "cargo watch", | ||
| 37 | "group": "build", | ||
| 38 | "isBackground": true, | ||
| 39 | "type": "shell", | ||
| 40 | "command": "cargo", | ||
| 41 | "args": [ | ||
| 42 | "watch" | ||
| 43 | ], | ||
| 44 | "problemMatcher": "$rustc-watch" | ||
| 45 | }, | ||
| 46 | { | ||
| 47 | "label": "cargo watch tests", | ||
| 48 | "group": "build", | ||
| 49 | "isBackground": true, | ||
| 50 | "type": "shell", | ||
| 51 | "command": "cargo", | ||
| 52 | "args": [ | ||
| 53 | "watch", | ||
| 54 | "-x", | ||
| 55 | "check --tests" | ||
| 56 | ], | ||
| 57 | "problemMatcher": "$rustc-watch" | ||
| 45 | } | 58 | } |
| 46 | ] | 59 | ] |
| 47 | } | 60 | } \ No newline at end of file |
diff --git a/editors/code/package.json b/editors/code/package.json index 47eaac878..0a1e84b4a 100644 --- a/editors/code/package.json +++ b/editors/code/package.json | |||
| @@ -215,8 +215,8 @@ | |||
| 215 | "${workspaceRoot}" | 215 | "${workspaceRoot}" |
| 216 | ], | 216 | ], |
| 217 | "background": { | 217 | "background": { |
| 218 | "beginsPattern": "^\\[Running ", | 218 | "beginsPattern": "^\\[Running\\b", |
| 219 | "endsPattern": "^(\\[Finished running\\]|To learn more, run the command again with --verbose\\.)$" | 219 | "endsPattern": "^\\[Finished running\\b" |
| 220 | }, | 220 | }, |
| 221 | "pattern": "$rustc" | 221 | "pattern": "$rustc" |
| 222 | } | 222 | } |