language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-08-31 15:47:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Configuration plumbing for cargo watcher

Browse source
This commit is contained in:
Emil Lauridsen 2019-12-25 16:50:38 +01:00
parent 41a1ec723c
commit 6af4bf7a8d
7 changed files with 85 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,16 +4,10 @@ import { Server } from './server';
const RA_LSP_DEBUG = process.env.__RA_LSP_SERVER_DEBUG;
export type CargoWatchStartupOptions = 'ask' | 'enabled' | 'disabled';
export type CargoWatchTraceOptions = 'off' | 'error' | 'verbose';
export interface CargoWatchOptions {
enableOnStartup: CargoWatchStartupOptions;
arguments: string;
command: string;
trace: CargoWatchTraceOptions;
ignore: string[];
allTargets: boolean;
export interface CargoCheckOptions {
enabled: boolean;
arguments: string[];
command: null | string;
}
export interface CargoFeatures {
@ -35,13 +29,10 @@ export class Config {
public featureFlags = {};
// for internal use
public withSysroot: null | boolean = null;
public cargoWatchOptions: CargoWatchOptions = {
enableOnStartup: 'ask',
trace: 'off',
arguments: '',
command: '',
ignore: [],
allTargets: true,
public cargoCheckOptions: CargoCheckOptions = {
enabled: true,
arguments: [],
command: null,
};
public cargoFeatures: CargoFeatures = {
noDefaultFeatures: false,
@ -100,44 +91,24 @@ export class Config {
RA_LSP_DEBUG || (config.get('raLspServerPath') as string);
}
if (config.has('enableCargoWatchOnStartup')) {
this.cargoWatchOptions.enableOnStartup = config.get<
CargoWatchStartupOptions
>('enableCargoWatchOnStartup', 'ask');
}
if (config.has('trace.cargo-watch')) {
this.cargoWatchOptions.trace = config.get<CargoWatchTraceOptions>(
'trace.cargo-watch',
'off',
if (config.has('enableCargoCheck')) {
this.cargoCheckOptions.enabled = config.get<boolean>(
'enableCargoCheck',
true,
);
}
if (config.has('cargo-watch.arguments')) {
this.cargoWatchOptions.arguments = config.get<string>(
this.cargoCheckOptions.arguments = config.get<string[]>(
'cargo-watch.arguments',
'',
);
}
if (config.has('cargo-watch.command')) {
this.cargoWatchOptions.command = config.get<string>(
'cargo-watch.command',
'',
);
}
if (config.has('cargo-watch.ignore')) {
this.cargoWatchOptions.ignore = config.get<string[]>(
'cargo-watch.ignore',
[],
);
}
if (config.has('cargo-watch.allTargets')) {
this.cargoWatchOptions.allTargets = config.get<boolean>(
'cargo-watch.allTargets',
true,
if (config.has('cargo-watch.command')) {
this.cargoCheckOptions.command = config.get<string>(
'cargo-watch.command',
'',
);
}

3
editors/code/src/server.ts
View file

@ -55,6 +55,9 @@ export class Server {
publishDecorations: true,
lruCapacity: Server.config.lruCapacity,
maxInlayHintLength: Server.config.maxInlayHintLength,
cargoCheckEnable: Server.config.cargoCheckOptions.enabled,
cargoCheckCommand: Server.config.cargoCheckOptions.command,
cargoCheckArgs: Server.config.cargoCheckOptions.arguments,
excludeGlobs: Server.config.excludeGlobs,
useClientWatching: Server.config.useClientWatching,
featureFlags: Server.config.featureFlags,