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 /crates/ra_lsp_server/src/main_loop | |
| 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 'crates/ra_lsp_server/src/main_loop')
| -rw-r--r-- | crates/ra_lsp_server/src/main_loop/handlers.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs index 5879a1f7a..3893430c0 100644 --- a/crates/ra_lsp_server/src/main_loop/handlers.rs +++ b/crates/ra_lsp_server/src/main_loop/handlers.rs | |||
| @@ -590,6 +590,7 @@ pub fn handle_formatting( | |||
| 590 | let end_position = TextUnit::of_str(&file).conv_with(&file_line_index); | 590 | let end_position = TextUnit::of_str(&file).conv_with(&file_line_index); |
| 591 | 591 | ||
| 592 | let mut rustfmt = process::Command::new("rustfmt"); | 592 | let mut rustfmt = process::Command::new("rustfmt"); |
| 593 | rustfmt.args(&world.options.rustfmt_args); | ||
| 593 | if let Some(&crate_id) = crate_ids.first() { | 594 | if let Some(&crate_id) = crate_ids.first() { |
| 594 | // Assume all crates are in the same edition | 595 | // Assume all crates are in the same edition |
| 595 | let edition = world.analysis().crate_edition(crate_id)?; | 596 | let edition = world.analysis().crate_edition(crate_id)?; |