diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-08-06 13:54:49 +0100 |
---|---|---|
committer | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-08-06 13:54:49 +0100 |
commit | 811492aa546d83daf56f61d334d6ee295651f111 (patch) | |
tree | 066a13499c26738cae11a34819b6048c5123d88b /editors | |
parent | c9718691043b041f5db878caea687b5a029d4475 (diff) | |
parent | 3d45da9bca7ab772ea483b496a901fc500e22033 (diff) |
Merge #1657
1657: Ignore r=matklad a=matklad
closes #1616
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'editors')
-rw-r--r-- | editors/code/package.json | 5 | ||||
-rw-r--r-- | editors/code/src/config.ts | 4 | ||||
-rw-r--r-- | editors/code/src/server.ts | 3 |
3 files changed, 11 insertions, 1 deletions
diff --git a/editors/code/package.json b/editors/code/package.json index 808dc5dc1..48ab886bf 100644 --- a/editors/code/package.json +++ b/editors/code/package.json | |||
@@ -197,6 +197,11 @@ | |||
197 | ], | 197 | ], |
198 | "description": "Whether to run `cargo watch` on startup" | 198 | "description": "Whether to run `cargo watch` on startup" |
199 | }, | 199 | }, |
200 | "rust-analyzer.excludeGlobs": { | ||
201 | "type": "array", | ||
202 | "default": "[]", | ||
203 | "description": "Paths to exclude from analysis" | ||
204 | }, | ||
200 | "rust-analyzer.cargo-watch.arguments": { | 205 | "rust-analyzer.cargo-watch.arguments": { |
201 | "type": "string", | 206 | "type": "string", |
202 | "description": "`cargo-watch` arguments. (e.g: `--features=\"shumway,pdf\"` will run as `cargo watch -x \"check --features=\"shumway,pdf\"\"` )", | 207 | "description": "`cargo-watch` arguments. (e.g: `--features=\"shumway,pdf\"` will run as `cargo watch -x \"check --features=\"shumway,pdf\"\"` )", |
diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts index 4d58a1a93..4df6b50ef 100644 --- a/editors/code/src/config.ts +++ b/editors/code/src/config.ts | |||
@@ -22,6 +22,7 @@ export class Config { | |||
22 | public showWorkspaceLoadedNotification = true; | 22 | public showWorkspaceLoadedNotification = true; |
23 | public lruCapacity: null | number = null; | 23 | public lruCapacity: null | number = null; |
24 | public displayInlayHints = true; | 24 | public displayInlayHints = true; |
25 | public excludeGlobs = []; | ||
25 | public cargoWatchOptions: CargoWatchOptions = { | 26 | public cargoWatchOptions: CargoWatchOptions = { |
26 | enableOnStartup: 'ask', | 27 | enableOnStartup: 'ask', |
27 | trace: 'off', | 28 | trace: 'off', |
@@ -128,5 +129,8 @@ export class Config { | |||
128 | if (config.has('displayInlayHints')) { | 129 | if (config.has('displayInlayHints')) { |
129 | this.displayInlayHints = config.get('displayInlayHints') as boolean; | 130 | this.displayInlayHints = config.get('displayInlayHints') as boolean; |
130 | } | 131 | } |
132 | if (config.has('excludeGlobs')) { | ||
133 | this.excludeGlobs = config.get('excludeGlobs') || []; | ||
134 | } | ||
131 | } | 135 | } |
132 | } | 136 | } |
diff --git a/editors/code/src/server.ts b/editors/code/src/server.ts index 7029142fd..2b4c25c28 100644 --- a/editors/code/src/server.ts +++ b/editors/code/src/server.ts | |||
@@ -36,7 +36,8 @@ export class Server { | |||
36 | publishDecorations: true, | 36 | publishDecorations: true, |
37 | showWorkspaceLoaded: | 37 | showWorkspaceLoaded: |
38 | Server.config.showWorkspaceLoadedNotification, | 38 | Server.config.showWorkspaceLoadedNotification, |
39 | lruCapacity: Server.config.lruCapacity | 39 | lruCapacity: Server.config.lruCapacity, |
40 | excludeGlobs: Server.config.excludeGlobs | ||
40 | }, | 41 | }, |
41 | traceOutputChannel | 42 | traceOutputChannel |
42 | }; | 43 | }; |