aboutsummaryrefslogtreecommitdiff
path: root/editors/code
diff options
context:
space:
mode:
authorIlya Titkov <[email protected]>2020-02-17 08:44:58 +0000
committerIlya Titkov <[email protected]>2020-02-17 08:44:58 +0000
commita2b0bdcc24a64061364aaa017bf6caef1810da7c (patch)
treee434da0a4a0d6f8413be638d6c5d98a215e98792 /editors/code
parent32fc890de87e25c342b7c141ef98b07cb1471128 (diff)
Add arguments to rustfmt
Diffstat (limited to 'editors/code')
-rw-r--r--editors/code/package.json18
-rw-r--r--editors/code/src/client.ts1
-rw-r--r--editors/code/src/config.ts3
3 files changed, 19 insertions, 3 deletions
diff --git a/editors/code/package.json b/editors/code/package.json
index ed1cae2ab..46acbfe76 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -188,6 +188,14 @@
188 "default": [], 188 "default": [],
189 "description": "Paths to exclude from analysis" 189 "description": "Paths to exclude from analysis"
190 }, 190 },
191 "rust-analyzer.rustfmtArgs": {
192 "type": "array",
193 "items": {
194 "type": "string"
195 },
196 "default": [],
197 "description": "Additional arguments to rustfmt"
198 },
191 "rust-analyzer.useClientWatching": { 199 "rust-analyzer.useClientWatching": {
192 "type": "boolean", 200 "type": "boolean",
193 "default": true, 201 "default": true,
@@ -233,7 +241,10 @@
233 "description": "Trace requests to the ra_lsp_server" 241 "description": "Trace requests to the ra_lsp_server"
234 }, 242 },
235 "rust-analyzer.lruCapacity": { 243 "rust-analyzer.lruCapacity": {
236 "type": [ "null", "integer" ], 244 "type": [
245 "null",
246 "integer"
247 ],
237 "default": null, 248 "default": null,
238 "minimum": 0, 249 "minimum": 0,
239 "exclusiveMinimum": true, 250 "exclusiveMinimum": true,
@@ -245,7 +256,10 @@
245 "description": "Display additional type and parameter information in the editor" 256 "description": "Display additional type and parameter information in the editor"
246 }, 257 },
247 "rust-analyzer.maxInlayHintLength": { 258 "rust-analyzer.maxInlayHintLength": {
248 "type": [ "null", "integer" ], 259 "type": [
260 "null",
261 "integer"
262 ],
249 "default": 20, 263 "default": 20,
250 "minimum": 0, 264 "minimum": 0,
251 "exclusiveMinimum": true, 265 "exclusiveMinimum": true,
diff --git a/editors/code/src/client.ts b/editors/code/src/client.ts
index efef820ab..11894973c 100644
--- a/editors/code/src/client.ts
+++ b/editors/code/src/client.ts
@@ -42,6 +42,7 @@ export async function createClient(config: Config): Promise<null | lc.LanguageCl
42 featureFlags: config.featureFlags, 42 featureFlags: config.featureFlags,
43 withSysroot: config.withSysroot, 43 withSysroot: config.withSysroot,
44 cargoFeatures: config.cargoFeatures, 44 cargoFeatures: config.cargoFeatures,
45 rustfmtArgs: config.rustfmtArgs,
45 }, 46 },
46 traceOutputChannel, 47 traceOutputChannel,
47 }; 48 };
diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index 70cb0a612..5fffd1fa7 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -149,7 +149,8 @@ export class Config {
149 get excludeGlobs() { return this.cfg.get("excludeGlobs") as string[]; } 149 get excludeGlobs() { return this.cfg.get("excludeGlobs") as string[]; }
150 get useClientWatching() { return this.cfg.get("useClientWatching") as boolean; } 150 get useClientWatching() { return this.cfg.get("useClientWatching") as boolean; }
151 get featureFlags() { return this.cfg.get("featureFlags") as Record<string, boolean>; } 151 get featureFlags() { return this.cfg.get("featureFlags") as Record<string, boolean>; }
152 152 get rustfmtArgs() { return this.cfg.get("rustfmtArgs") as string[]; }
153
153 get cargoWatchOptions(): CargoWatchOptions { 154 get cargoWatchOptions(): CargoWatchOptions {
154 return { 155 return {
155 enable: this.cfg.get("cargo-watch.enable") as boolean, 156 enable: this.cfg.get("cargo-watch.enable") as boolean,