diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-12-29 12:57:24 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-12-29 12:57:24 +0000 |
commit | dc48f89581843248660ceb755bb20469ab6ac0c9 (patch) | |
tree | 05a7e47d1c68c250025be1ce6492f56c15353749 /editors/code/package.json | |
parent | cdcb3d3833d3d5b37b2cd4dac91a6e9366f20aea (diff) | |
parent | 899dbebd02b41b12d89c9f485e85208b39b81932 (diff) |
Merge #2668
2668: In-server cargo check watching r=matklad a=kiljacken
Opening a draft now so people can follow the progress, and comment if they spot something stupid.
Things that need doing:
- [x] Running cargo check on save
- [x] Pipe through configuration options from client
- [x] Tests for parsing behavior
- [x] Remove existing cargo watch support from VSCode extension
- [x] Progress notification in VSCode extension using LSP 3.15 `$/progress` notification
- [ ] ~~Rework ra-ide diagnostics to support secondary messages~~
- [ ] ~~Make cargo-check watcher use ra-ide diagnostics~~
~~I'd love some input on whether to try to keep the status bar progress thingy for VSCode? It will require some plumbing, and maintaining yet another rust-analyzer specific LSP notification, which I'm not sure we want to.~~
Fixes #1894
Co-authored-by: Emil Lauridsen <[email protected]>
Diffstat (limited to 'editors/code/package.json')
-rw-r--r-- | editors/code/package.json | 52 |
1 files changed, 8 insertions, 44 deletions
diff --git a/editors/code/package.json b/editors/code/package.json index f75fafeb9..69298e917 100644 --- a/editors/code/package.json +++ b/editors/code/package.json | |||
@@ -18,7 +18,7 @@ | |||
18 | "scripts": { | 18 | "scripts": { |
19 | "vscode:prepublish": "npm run compile", | 19 | "vscode:prepublish": "npm run compile", |
20 | "package": "vsce package", | 20 | "package": "vsce package", |
21 | "compile": "rollup -c && shx cp src/utils/terminateProcess.sh bundle/terminateProcess.sh", | 21 | "compile": "rollup -c", |
22 | "watch": "tsc -watch -p ./", | 22 | "watch": "tsc -watch -p ./", |
23 | "fix": "prettier **/*.{json,ts} --write && tslint --project . --fix", | 23 | "fix": "prettier **/*.{json,ts} --write && tslint --project . --fix", |
24 | "lint": "tslint --project .", | 24 | "lint": "tslint --project .", |
@@ -133,16 +133,6 @@ | |||
133 | "command": "rust-analyzer.reload", | 133 | "command": "rust-analyzer.reload", |
134 | "title": "Restart server", | 134 | "title": "Restart server", |
135 | "category": "Rust Analyzer" | 135 | "category": "Rust Analyzer" |
136 | }, | ||
137 | { | ||
138 | "command": "rust-analyzer.startCargoWatch", | ||
139 | "title": "Start Cargo Watch", | ||
140 | "category": "Rust Analyzer" | ||
141 | }, | ||
142 | { | ||
143 | "command": "rust-analyzer.stopCargoWatch", | ||
144 | "title": "Stop Cargo Watch", | ||
145 | "category": "Rust Analyzer" | ||
146 | } | 136 | } |
147 | ], | 137 | ], |
148 | "keybindings": [ | 138 | "keybindings": [ |
@@ -198,21 +188,6 @@ | |||
198 | "default": "ra_lsp_server", | 188 | "default": "ra_lsp_server", |
199 | "description": "Path to ra_lsp_server executable" | 189 | "description": "Path to ra_lsp_server executable" |
200 | }, | 190 | }, |
201 | "rust-analyzer.enableCargoWatchOnStartup": { | ||
202 | "type": "string", | ||
203 | "default": "ask", | ||
204 | "enum": [ | ||
205 | "ask", | ||
206 | "enabled", | ||
207 | "disabled" | ||
208 | ], | ||
209 | "enumDescriptions": [ | ||
210 | "Asks each time whether to run `cargo watch`", | ||
211 | "`cargo watch` is always started", | ||
212 | "Don't start `cargo watch`" | ||
213 | ], | ||
214 | "description": "Whether to run `cargo watch` on startup" | ||
215 | }, | ||
216 | "rust-analyzer.excludeGlobs": { | 191 | "rust-analyzer.excludeGlobs": { |
217 | "type": "array", | 192 | "type": "array", |
218 | "default": [], | 193 | "default": [], |
@@ -223,21 +198,21 @@ | |||
223 | "default": true, | 198 | "default": true, |
224 | "description": "client provided file watching instead of notify watching." | 199 | "description": "client provided file watching instead of notify watching." |
225 | }, | 200 | }, |
201 | "rust-analyzer.cargo-watch.enable": { | ||
202 | "type": "boolean", | ||
203 | "default": true, | ||
204 | "description": "Run `cargo check` for diagnostics on save" | ||
205 | }, | ||
226 | "rust-analyzer.cargo-watch.arguments": { | 206 | "rust-analyzer.cargo-watch.arguments": { |
227 | "type": "string", | 207 | "type": "array", |
228 | "description": "`cargo-watch` arguments. (e.g: `--features=\"shumway,pdf\"` will run as `cargo watch -x \"check --features=\"shumway,pdf\"\"` )", | 208 | "description": "`cargo-watch` arguments. (e.g: `--features=\"shumway,pdf\"` will run as `cargo watch -x \"check --features=\"shumway,pdf\"\"` )", |
229 | "default": "" | 209 | "default": [] |
230 | }, | 210 | }, |
231 | "rust-analyzer.cargo-watch.command": { | 211 | "rust-analyzer.cargo-watch.command": { |
232 | "type": "string", | 212 | "type": "string", |
233 | "description": "`cargo-watch` command. (e.g: `clippy` will run as `cargo watch -x clippy` )", | 213 | "description": "`cargo-watch` command. (e.g: `clippy` will run as `cargo watch -x clippy` )", |
234 | "default": "check" | 214 | "default": "check" |
235 | }, | 215 | }, |
236 | "rust-analyzer.cargo-watch.ignore": { | ||
237 | "type": "array", | ||
238 | "description": "A list of patterns for cargo-watch to ignore (will be passed as `--ignore`)", | ||
239 | "default": [] | ||
240 | }, | ||
241 | "rust-analyzer.cargo-watch.allTargets": { | 216 | "rust-analyzer.cargo-watch.allTargets": { |
242 | "type": "boolean", | 217 | "type": "boolean", |
243 | "description": "Check all targets and tests (will be passed as `--all-targets`)", | 218 | "description": "Check all targets and tests (will be passed as `--all-targets`)", |
@@ -259,17 +234,6 @@ | |||
259 | "default": "off", | 234 | "default": "off", |
260 | "description": "Trace requests to the ra_lsp_server" | 235 | "description": "Trace requests to the ra_lsp_server" |
261 | }, | 236 | }, |
262 | "rust-analyzer.trace.cargo-watch": { | ||
263 | "type": "string", | ||
264 | "scope": "window", | ||
265 | "enum": [ | ||
266 | "off", | ||
267 | "error", | ||
268 | "verbose" | ||
269 | ], | ||
270 | "default": "off", | ||
271 | "description": "Trace output of cargo-watch" | ||
272 | }, | ||
273 | "rust-analyzer.lruCapacity": { | 237 | "rust-analyzer.lruCapacity": { |
274 | "type": "number", | 238 | "type": "number", |
275 | "default": null, | 239 | "default": null, |