diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-07-10 20:06:44 +0100 |
---|---|---|
committer | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-07-10 20:06:44 +0100 |
commit | 46d7b08c5f0440fed43399ffe925e30bfe95e5dd (patch) | |
tree | 0d35c0ddd0c970b39bc0b3bd94b52ea00fe97e52 /crates/ra_assists/src/ast_editor.rs | |
parent | 82c3fe7d13b67bdec67b53e9adb6f3ec404bf5f0 (diff) | |
parent | 895597d56739c4f181f22e56d8a13a5376d2974a (diff) |
Merge #1519
1519: Move whitespace manipulation inside AstEditor r=matklad a=viorina
Co-authored-by: Ekaterina Babshukova <[email protected]>
Diffstat (limited to 'crates/ra_assists/src/ast_editor.rs')
-rw-r--r-- | crates/ra_assists/src/ast_editor.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crates/ra_assists/src/ast_editor.rs b/crates/ra_assists/src/ast_editor.rs index c9a5cf8d9..ba816eb65 100644 --- a/crates/ra_assists/src/ast_editor.rs +++ b/crates/ra_assists/src/ast_editor.rs | |||
@@ -85,10 +85,6 @@ impl AstEditor<ast::NamedFieldList> { | |||
85 | self.insert_field(InsertPosition::Last, field) | 85 | self.insert_field(InsertPosition::Last, field) |
86 | } | 86 | } |
87 | 87 | ||
88 | pub fn make_multiline(&mut self) { | ||
89 | self.do_make_multiline() | ||
90 | } | ||
91 | |||
92 | pub fn insert_field( | 88 | pub fn insert_field( |
93 | &mut self, | 89 | &mut self, |
94 | position: InsertPosition<&'_ ast::NamedField>, | 90 | position: InsertPosition<&'_ ast::NamedField>, |
@@ -161,8 +157,12 @@ impl AstEditor<ast::NamedFieldList> { | |||
161 | } | 157 | } |
162 | 158 | ||
163 | impl AstEditor<ast::ItemList> { | 159 | impl AstEditor<ast::ItemList> { |
164 | pub fn make_multiline(&mut self) { | 160 | pub fn append_items<'a>(&mut self, items: impl Iterator<Item = &'a ast::ImplItem>) { |
165 | self.do_make_multiline() | 161 | let n_existing_items = self.ast().impl_items().count(); |
162 | if n_existing_items == 0 { | ||
163 | self.do_make_multiline(); | ||
164 | } | ||
165 | items.for_each(|it| self.append_item(it)); | ||
166 | } | 166 | } |
167 | 167 | ||
168 | pub fn append_item(&mut self, item: &ast::ImplItem) { | 168 | pub fn append_item(&mut self, item: &ast::ImplItem) { |