aboutsummaryrefslogtreecommitdiff
path: root/editors/code/src
diff options
context:
space:
mode:
authorAleksei Sidorov <[email protected]>2019-06-24 11:33:37 +0100
committerAleksei Sidorov <[email protected]>2019-06-24 11:33:37 +0100
commitb1bc629b83c65c0a3cc0e47a3f55969b9bab950e (patch)
treebbe34a9a801a509050bf6d41420930336f331d01 /editors/code/src
parent4722e6d491a29bdb077fc01aa8c5bdc734282c69 (diff)
Fix tslints
Diffstat (limited to 'editors/code/src')
-rw-r--r--editors/code/src/commands/cargo_watch.ts4
-rw-r--r--editors/code/src/config.ts4
2 files changed, 3 insertions, 5 deletions
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 {
57 return; 57 return;
58 } 58 }
59 59
60 let command = Server.config.cargoWatchOptions.checkCommand; 60 let args = Server.config.cargoWatchOptions.checkCommand + ' --all-targets --message-format json';
61
62 let args = command + ' --all-targets --message-format json';
63 if (Server.config.cargoWatchOptions.checkArguments.length > 0) { 61 if (Server.config.cargoWatchOptions.checkArguments.length > 0) {
64 // Excape the double quote string: 62 // Excape the double quote string:
65 args += ' ' + Server.config.cargoWatchOptions.checkArguments; 63 args += ' ' + Server.config.cargoWatchOptions.checkArguments;
diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index 85366fc34..db46874dc 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -1,7 +1,7 @@
1import * as vscode from 'vscode'; 1import * as vscode from 'vscode';
2 2
3import { Server } from './server';
4import { strict } from 'assert'; 3import { strict } from 'assert';
4import { Server } from './server';
5 5
6const RA_LSP_DEBUG = process.env.__RA_LSP_SERVER_DEBUG; 6const RA_LSP_DEBUG = process.env.__RA_LSP_SERVER_DEBUG;
7 7
@@ -116,7 +116,7 @@ export class Config {
116 116
117 if (config.has('cargo-watch.check-command')) { 117 if (config.has('cargo-watch.check-command')) {
118 this.cargoWatchOptions.checkCommand = config.get<string>( 118 this.cargoWatchOptions.checkCommand = config.get<string>(
119 'cargo-watch.check-command', 119 'cargo-watch.check-command',
120 '' 120 ''
121 ); 121 );
122 } 122 }