Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-25 20:43:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Adds config option for cargo-watch --ignore flag

Browse source
This commit is contained in:
Roberto Vidal 2019-10-17 15:22:39 +02:00
parent e8a7a7b19a
commit f4d50de275
4 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
docs/user/README.md
View file

@ -79,6 +79,7 @@ See [microsoft/vscode#72308](https://github.com/microsoft/vscode/issues/72308) f
* `rust-analyzer.cargo-watch.command`: `cargo-watch` command. (e.g: `clippy` will run as `cargo watch -x clippy` )
* `rust-analyzer.cargo-watch.arguments`: cargo-watch check arguments.
(e.g: `--features="shumway,pdf"` will run as `cargo watch -x "check --features="shumway,pdf""` )
* `rust-analyzer.cargo-watch.ignore`: list of patterns for cargo-watch to ignore (will be passed as `--ignore`)
* `rust-analyzer.trace.server`: enables internal logging
* `rust-analyzer.trace.cargo-watch`: enables cargo-watch logging
* `RUST_SRC_PATH`: environment variable that overwrites the sysroot

5
editors/code/package.json
View file

@ -224,6 +224,11 @@
"description": "`cargo-watch` command. (e.g: `clippy` will run as `cargo watch -x clippy` )",
"default": "check"
},
"rust-analyzer.cargo-watch.ignore": {
"type": "array",
"description": "A list of patterns for cargo-watch to ignore (will be passed as `--ignore`)",
"default": []
},
"rust-analyzer.showWorkspaceLoadedNotification": {
"type": "boolean",
"description": "Controls whether rust-analyzer displays a notification when a project is loaded.",

7
editors/code/src/commands/cargo_watch.ts
View file

@ -93,10 +93,15 @@ export class CargoWatchProvider implements vscode.Disposable {
args = '"' + args + '"';
}
const ignoreFlags = Server.config.cargoWatchOptions.ignore.reduce(
(flags, pattern) => [...flags, '--ignore', pattern],
[] as string[]
);
// Start the cargo watch with json message
this.cargoProcess = child_process.spawn(
'cargo',
['watch', '-x', args],
['watch', '-x', args, ...ignoreFlags],
{
stdio: ['ignore', 'pipe', 'pipe'],
cwd: vscode.workspace.rootPath,

11
editors/code/src/config.ts
View file

@ -12,6 +12,7 @@ export interface CargoWatchOptions {
arguments: string;
command: string;
trace: CargoWatchTraceOptions;
ignore: string[];
}
export class Config {
@ -29,7 +30,8 @@ export class Config {
enableOnStartup: 'ask',
trace: 'off',
arguments: '',
command: ''
command: '',
ignore: []
};
private prevEnhancedTyping: null | boolean = null;
@ -124,6 +126,13 @@ export class Config {
);
}
if (config.has('cargo-watch.ignore')) {
this.cargoWatchOptions.ignore = config.get<string[]>(
'cargo-watch.ignore',
[]
);
}
if (config.has('lruCapacity')) {
this.lruCapacity = config.get('lruCapacity') as number;
}