diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-02-17 09:05:01 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-02-17 09:05:01 +0000 |
commit | 953dbe3e02fa87bab2f12452746e6c50a47ac153 (patch) | |
tree | d1bd6044ce673398b79baaa318a3d063cae290f9 /editors/code/src | |
parent | c9989a524caa3379aac4f451a452c7ac9b247ae8 (diff) | |
parent | a2b0bdcc24a64061364aaa017bf6caef1810da7c (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/src')
-rw-r--r-- | editors/code/src/client.ts | 1 | ||||
-rw-r--r-- | editors/code/src/config.ts | 3 |
2 files changed, 3 insertions, 1 deletions
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, |