aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_editor/src
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2018-12-09 12:44:58 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2018-12-09 12:44:58 +0000
commit3725276554fe63fdd9b63a10b86e794b3eb73158 (patch)
tree01de23f215e51459c67d2eb7f4bfb77d65afd1b7 /crates/ra_editor/src
parentb9c17a6001aaf79e181a86218883fe96d9c95c09 (diff)
parentcbce28a348ebb5db646cfc5cd3305c6bce80e915 (diff)
Merge #271
271: Implement format hook r=matklad a=DJMcNab Tentatively: fixes #155. However, this does add all changes in staged files, which might not be desirable. However, I think we can't solve that without explicit support in rustfmt for it, so it should be fine. Co-authored-by: DJMcNab <[email protected]>
Diffstat (limited to 'crates/ra_editor/src')
-rw-r--r--crates/ra_editor/src/typing.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_editor/src/typing.rs b/crates/ra_editor/src/typing.rs
index 9703e0371..01acdda7c 100644
--- a/crates/ra_editor/src/typing.rs
+++ b/crates/ra_editor/src/typing.rs
@@ -20,7 +20,7 @@ pub fn join_lines(file: &SourceFileNode, range: TextRange) -> LocalEdit {
20 return LocalEdit { 20 return LocalEdit {
21 edit: EditBuilder::new().finish(), 21 edit: EditBuilder::new().finish(),
22 cursor_position: None, 22 cursor_position: None,
23 } 23 };
24 } 24 }
25 Some(pos) => pos, 25 Some(pos) => pos,
26 }; 26 };