aboutsummaryrefslogtreecommitdiff
path: root/editors/code
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-02-17 09:05:01 +0000
committerGitHub <[email protected]>2020-02-17 09:05:01 +0000
commit953dbe3e02fa87bab2f12452746e6c50a47ac153 (patch)
treed1bd6044ce673398b79baaa318a3d063cae290f9 /editors/code
parentc9989a524caa3379aac4f451a452c7ac9b247ae8 (diff)
parenta2b0bdcc24a64061364aaa017bf6caef1810da7c (diff)
Merge #3181
3181: Add ability to pass additional arguments to rustfmt. r=matklad a=Leonqn relates to #2848 Co-authored-by: Ilya Titkov <[email protected]>
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 53e2a414b..c3fa788c7 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -148,7 +148,8 @@ export class Config {
148 get excludeGlobs() { return this.cfg.get("excludeGlobs") as string[]; } 148 get excludeGlobs() { return this.cfg.get("excludeGlobs") as string[]; }
149 get useClientWatching() { return this.cfg.get("useClientWatching") as boolean; } 149 get useClientWatching() { return this.cfg.get("useClientWatching") as boolean; }
150 get featureFlags() { return this.cfg.get("featureFlags") as Record<string, boolean>; } 150 get featureFlags() { return this.cfg.get("featureFlags") as Record<string, boolean>; }
151 151 get rustfmtArgs() { return this.cfg.get("rustfmtArgs") as string[]; }
152
152 get cargoWatchOptions(): CargoWatchOptions { 153 get cargoWatchOptions(): CargoWatchOptions {
153 return { 154 return {
154 enable: this.cfg.get("cargo-watch.enable") as boolean, 155 enable: this.cfg.get("cargo-watch.enable") as boolean,