diff options
Diffstat (limited to 'editors/code/src/config.ts')
-rw-r--r-- | editors/code/src/config.ts | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts index 96532e2c9..4b388b80c 100644 --- a/editors/code/src/config.ts +++ b/editors/code/src/config.ts | |||
@@ -4,10 +4,11 @@ import { Server } from './server'; | |||
4 | 4 | ||
5 | const RA_LSP_DEBUG = process.env.__RA_LSP_SERVER_DEBUG; | 5 | const RA_LSP_DEBUG = process.env.__RA_LSP_SERVER_DEBUG; |
6 | 6 | ||
7 | export interface CargoCheckOptions { | 7 | export interface CargoWatchOptions { |
8 | enabled: boolean; | 8 | enable: boolean; |
9 | arguments: string[]; | 9 | arguments: string[]; |
10 | command: null | string; | 10 | command: string; |
11 | allTargets: boolean; | ||
11 | } | 12 | } |
12 | 13 | ||
13 | export interface CargoFeatures { | 14 | export interface CargoFeatures { |
@@ -29,10 +30,11 @@ export class Config { | |||
29 | public featureFlags = {}; | 30 | public featureFlags = {}; |
30 | // for internal use | 31 | // for internal use |
31 | public withSysroot: null | boolean = null; | 32 | public withSysroot: null | boolean = null; |
32 | public cargoCheckOptions: CargoCheckOptions = { | 33 | public cargoWatchOptions: CargoWatchOptions = { |
33 | enabled: true, | 34 | enable: true, |
34 | arguments: [], | 35 | arguments: [], |
35 | command: null, | 36 | command: '', |
37 | allTargets: true, | ||
36 | }; | 38 | }; |
37 | public cargoFeatures: CargoFeatures = { | 39 | public cargoFeatures: CargoFeatures = { |
38 | noDefaultFeatures: false, | 40 | noDefaultFeatures: false, |
@@ -91,27 +93,34 @@ export class Config { | |||
91 | RA_LSP_DEBUG || (config.get('raLspServerPath') as string); | 93 | RA_LSP_DEBUG || (config.get('raLspServerPath') as string); |
92 | } | 94 | } |
93 | 95 | ||
94 | if (config.has('enableCargoCheck')) { | 96 | if (config.has('cargo-watch.enable')) { |
95 | this.cargoCheckOptions.enabled = config.get<boolean>( | 97 | this.cargoWatchOptions.enable = config.get<boolean>( |
96 | 'enableCargoCheck', | 98 | 'cargo-watch.enable', |
97 | true, | 99 | true, |
98 | ); | 100 | ); |
99 | } | 101 | } |
100 | 102 | ||
101 | if (config.has('cargo-watch.arguments')) { | 103 | if (config.has('cargo-watch.arguments')) { |
102 | this.cargoCheckOptions.arguments = config.get<string[]>( | 104 | this.cargoWatchOptions.arguments = config.get<string[]>( |
103 | 'cargo-watch.arguments', | 105 | 'cargo-watch.arguments', |
104 | [], | 106 | [], |
105 | ); | 107 | ); |
106 | } | 108 | } |
107 | 109 | ||
108 | if (config.has('cargo-watch.command')) { | 110 | if (config.has('cargo-watch.command')) { |
109 | this.cargoCheckOptions.command = config.get<string>( | 111 | this.cargoWatchOptions.command = config.get<string>( |
110 | 'cargo-watch.command', | 112 | 'cargo-watch.command', |
111 | '', | 113 | '', |
112 | ); | 114 | ); |
113 | } | 115 | } |
114 | 116 | ||
117 | if (config.has('cargo-watch.allTargets')) { | ||
118 | this.cargoWatchOptions.allTargets = config.get<boolean>( | ||
119 | 'cargo-watch.allTargets', | ||
120 | true, | ||
121 | ); | ||
122 | } | ||
123 | |||
115 | if (config.has('lruCapacity')) { | 124 | if (config.has('lruCapacity')) { |
116 | this.lruCapacity = config.get('lruCapacity') as number; | 125 | this.lruCapacity = config.get('lruCapacity') as number; |
117 | } | 126 | } |