Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 04:53:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Introduce cargo-watch.check-command

Browse source
This commit is contained in:
Aleksei Sidorov 2019-06-24 13:02:20 +03:00
parent 7d79be3280
commit 4722e6d491
4 changed files with 27 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
editors/code/package.json
View file

@ -203,9 +203,14 @@
},
"rust-analyzer.cargo-watch.check-arguments": {
"type": "string",
"description": "`cargo-watch` check arguments. (e.g: `--features=\"shumway,pdf\"` will run as `cargo watch -x \"check --features=\"shumway,pdf\"\"` )",
"description": "`cargo-watch` arguments. (e.g: `--features=\"shumway,pdf\"` will run as `cargo watch -x \"check --features=\"shumway,pdf\"\"` )",
"default": ""
},
"rust-analyzer.cargo-watch.check-command": {
"type": "string",
"description": "`cargo-watch` command. (e.g: `clippy` will run as `cargo watch -x clippy` )",
"default": "check"
},
"rust-analyzer.trace.server": {
"type": "string",
"scope": "window",

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

@ -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;

8
editors/code/src/commands/watch_status.ts
View file

@ -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);

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

@ -1,6 +1,7 @@
import * as vscode from 'vscode';
import { Server } from './server';
import { strict } from 'assert';
const RA_LSP_DEBUG = process.env.__RA_LSP_SERVER_DEBUG;
@ -10,6 +11,7 @@ export type CargoWatchTraceOptions = 'off' | 'error' | 'verbose';
export interface CargoWatchOptions {
enableOnStartup: CargoWatchStartupOptions;
checkArguments: string;
checkCommand: string;
trace: CargoWatchTraceOptions;
}
@ -23,7 +25,8 @@ export class Config {
public cargoWatchOptions: CargoWatchOptions = {
enableOnStartup: 'ask',
trace: 'off',
checkArguments: ''
checkArguments: '',
checkCommand: ''
};
private prevEnhancedTyping: null | boolean = null;
@ -110,6 +113,14 @@ export class Config {
''
);
}
if (config.has('cargo-watch.check-command')) {
this.cargoWatchOptions.checkCommand = config.get<string>(
'cargo-watch.check-command',
''
);
}
if (config.has('lruCapacity')) {
this.lruCapacity = config.get('lruCapacity') as number;
}