From 4722e6d491a29bdb077fc01aa8c5bdc734282c69 Mon Sep 17 00:00:00 2001 From: Aleksei Sidorov Date: Mon, 24 Jun 2019 13:02:20 +0300 Subject: Introduce cargo-watch.check-command --- editors/code/src/commands/cargo_watch.ts | 6 ++++-- editors/code/src/commands/watch_status.ts | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'editors/code/src/commands') diff --git a/editors/code/src/commands/cargo_watch.ts b/editors/code/src/commands/cargo_watch.ts index 6ba794bb3..db92e03f4 100644 --- a/editors/code/src/commands/cargo_watch.ts +++ b/editors/code/src/commands/cargo_watch.ts @@ -43,7 +43,7 @@ export class CargoWatchProvider implements vscode.Disposable { this.diagnosticCollection = vscode.languages.createDiagnosticCollection( 'rustc' ); - this.statusDisplay = new StatusDisplay(); + this.statusDisplay = new StatusDisplay(Server.config.cargoWatchOptions.checkCommand); this.outputChannel = vscode.window.createOutputChannel( 'Cargo Watch Trace' ); @@ -57,7 +57,9 @@ export class CargoWatchProvider implements vscode.Disposable { return; } - let args = 'check --all-targets --message-format json'; + let command = Server.config.cargoWatchOptions.checkCommand; + + let args = command + ' --all-targets --message-format json'; if (Server.config.cargoWatchOptions.checkArguments.length > 0) { // Excape the double quote string: args += ' ' + Server.config.cargoWatchOptions.checkArguments; diff --git a/editors/code/src/commands/watch_status.ts b/editors/code/src/commands/watch_status.ts index a3b0178f2..91bc7195b 100644 --- a/editors/code/src/commands/watch_status.ts +++ b/editors/code/src/commands/watch_status.ts @@ -7,13 +7,15 @@ export class StatusDisplay implements vscode.Disposable { private i = 0; private statusBarItem: vscode.StatusBarItem; + private command: string; private timer?: NodeJS.Timeout; - constructor() { + constructor(command: string) { this.statusBarItem = vscode.window.createStatusBarItem( vscode.StatusBarAlignment.Left, 10 ); + this.command = command; this.statusBarItem.hide(); } @@ -24,11 +26,11 @@ export class StatusDisplay implements vscode.Disposable { this.timer || setInterval(() => { if (this.packageName) { - this.statusBarItem!.text = `cargo check [${ + this.statusBarItem!.text = `cargo ${this.command} [${ this.packageName }] ${this.frame()}`; } else { - this.statusBarItem!.text = `cargo check ${this.frame()}`; + this.statusBarItem!.text = `cargo ${this.command} ${this.frame()}`; } }, 300); -- cgit v1.2.3 From b1bc629b83c65c0a3cc0e47a3f55969b9bab950e Mon Sep 17 00:00:00 2001 From: Aleksei Sidorov Date: Mon, 24 Jun 2019 13:33:37 +0300 Subject: Fix tslints --- editors/code/src/commands/cargo_watch.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'editors/code/src/commands') diff --git a/editors/code/src/commands/cargo_watch.ts b/editors/code/src/commands/cargo_watch.ts index db92e03f4..16aac3758 100644 --- a/editors/code/src/commands/cargo_watch.ts +++ b/editors/code/src/commands/cargo_watch.ts @@ -57,9 +57,7 @@ export class CargoWatchProvider implements vscode.Disposable { return; } - let command = Server.config.cargoWatchOptions.checkCommand; - - let args = command + ' --all-targets --message-format json'; + let args = Server.config.cargoWatchOptions.checkCommand + ' --all-targets --message-format json'; if (Server.config.cargoWatchOptions.checkArguments.length > 0) { // Excape the double quote string: args += ' ' + Server.config.cargoWatchOptions.checkArguments; -- cgit v1.2.3 From 28e9e8d4cfdf2a334cde6db7d10e7acb8f5fe8b1 Mon Sep 17 00:00:00 2001 From: Aleksei Sidorov Date: Mon, 24 Jun 2019 13:50:34 +0300 Subject: Fix code after "apply suggestions" --- editors/code/src/commands/cargo_watch.ts | 12 ++++++++---- editors/code/src/commands/watch_status.ts | 4 +++- 2 files changed, 11 insertions(+), 5 deletions(-) (limited to 'editors/code/src/commands') diff --git a/editors/code/src/commands/cargo_watch.ts b/editors/code/src/commands/cargo_watch.ts index 16aac3758..13adf4c10 100644 --- a/editors/code/src/commands/cargo_watch.ts +++ b/editors/code/src/commands/cargo_watch.ts @@ -43,7 +43,9 @@ export class CargoWatchProvider implements vscode.Disposable { this.diagnosticCollection = vscode.languages.createDiagnosticCollection( 'rustc' ); - this.statusDisplay = new StatusDisplay(Server.config.cargoWatchOptions.checkCommand); + this.statusDisplay = new StatusDisplay( + Server.config.cargoWatchOptions.command + ); this.outputChannel = vscode.window.createOutputChannel( 'Cargo Watch Trace' ); @@ -57,10 +59,12 @@ export class CargoWatchProvider implements vscode.Disposable { return; } - let args = Server.config.cargoWatchOptions.checkCommand + ' --all-targets --message-format json'; - if (Server.config.cargoWatchOptions.checkArguments.length > 0) { + let args = + Server.config.cargoWatchOptions.command + + ' --all-targets --message-format json'; + if (Server.config.cargoWatchOptions.command.length > 0) { // Excape the double quote string: - args += ' ' + Server.config.cargoWatchOptions.checkArguments; + args += ' ' + Server.config.cargoWatchOptions.arguments; } // Windows handles arguments differently than the unix-likes, so we need to wrap the args in double quotes if (process.platform === 'win32') { diff --git a/editors/code/src/commands/watch_status.ts b/editors/code/src/commands/watch_status.ts index 91bc7195b..6c1f9041b 100644 --- a/editors/code/src/commands/watch_status.ts +++ b/editors/code/src/commands/watch_status.ts @@ -30,7 +30,9 @@ export class StatusDisplay implements vscode.Disposable { this.packageName }] ${this.frame()}`; } else { - this.statusBarItem!.text = `cargo ${this.command} ${this.frame()}`; + this.statusBarItem!.text = `cargo ${ + this.command + } ${this.frame()}`; } }, 300); -- cgit v1.2.3