aboutsummaryrefslogtreecommitdiff
path: root/editors/code/src/commands
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-10-17 19:44:59 +0100
committerGitHub <[email protected]>2019-10-17 19:44:59 +0100
commitb060d8446767c8071197bbd49e700867722b564e (patch)
treeb55fba950d29f6bd041f26e78e3e56cefb649c31 /editors/code/src/commands
parente8a7a7b19aab195d2b37a0b13abca4e006e9bbd5 (diff)
parentf4d50de2758b38208745d9594ccbcf0227d49d5b (diff)
Merge #2029
2029: Adds config option for cargo-watch `--ignore` flag r=matklad a=jrvidal I presume this is a nice-to-have to avoid spurious watching. * I don't know much about Windows, so I'm not sure if the extra args need some special escaping. * I suppose we could reuse and/or integrate with `rust-analyzer.excludeGlobs`. I find this simpler, but I'm open to suggestions. Co-authored-by: Roberto Vidal <[email protected]>
Diffstat (limited to 'editors/code/src/commands')
-rw-r--r--editors/code/src/commands/cargo_watch.ts7
1 files changed, 6 insertions, 1 deletions
diff --git a/editors/code/src/commands/cargo_watch.ts b/editors/code/src/commands/cargo_watch.ts
index 00b24dbce..59d4ba97a 100644
--- a/editors/code/src/commands/cargo_watch.ts
+++ b/editors/code/src/commands/cargo_watch.ts
@@ -93,10 +93,15 @@ export class CargoWatchProvider implements vscode.Disposable {
93 args = '"' + args + '"'; 93 args = '"' + args + '"';
94 } 94 }
95 95
96 const ignoreFlags = Server.config.cargoWatchOptions.ignore.reduce(
97 (flags, pattern) => [...flags, '--ignore', pattern],
98 [] as string[]
99 );
100
96 // Start the cargo watch with json message 101 // Start the cargo watch with json message
97 this.cargoProcess = child_process.spawn( 102 this.cargoProcess = child_process.spawn(
98 'cargo', 103 'cargo',
99 ['watch', '-x', args], 104 ['watch', '-x', args, ...ignoreFlags],
100 { 105 {
101 stdio: ['ignore', 'pipe', 'pipe'], 106 stdio: ['ignore', 'pipe', 'pipe'],
102 cwd: vscode.workspace.rootPath, 107 cwd: vscode.workspace.rootPath,