Skip to content

Commit 9253d39

Browse files
authored
Merge pull request #21872 from A4-Tacks/indent-single-zero
internal: rename IndentLevel::single to zero
2 parents 6f1cf03 + bc10e73 commit 9253d39

5 files changed

Lines changed: 5 additions & 9 deletions

File tree

crates/ide-assists/src/handlers/extract_struct_from_enum_variant.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ use syntax::{
1616
SyntaxKind::*,
1717
SyntaxNode, T,
1818
ast::{
19-
self, AstNode, HasAttrs, HasGenericParams, HasName, HasVisibility,
20-
edit::{AstNodeEdit, IndentLevel},
21-
make,
19+
self, AstNode, HasAttrs, HasGenericParams, HasName, HasVisibility, edit::AstNodeEdit, make,
2220
},
2321
match_ast, ted,
2422
};
@@ -290,7 +288,6 @@ fn create_struct_def(
290288
field_list.clone().into()
291289
}
292290
};
293-
let field_list = field_list.indent(IndentLevel::single());
294291

295292
let strukt = make::struct_(enum_vis, name, generics, field_list).clone_for_update();
296293

crates/ide-assists/src/utils.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,6 @@ pub fn add_trait_assoc_items_to_impl_with_factory(
324324
ExprFillDefaultMode::Underscore => make.expr_underscore().into(),
325325
};
326326
let new_body = make.block_expr(None::<ast::Stmt>, Some(fill_expr));
327-
let new_body = AstNodeEdit::indent(&new_body, IndentLevel::single());
328327
let mut fn_editor = SyntaxEditor::new(fn_.syntax().clone());
329328
fn_.replace_or_insert_body(&mut fn_editor, new_body);
330329
let new_fn_ = fn_editor.finish().new_root().clone();

crates/syntax/src/ast/edit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ impl ops::AddAssign<u8> for IndentLevel {
5050
}
5151

5252
impl IndentLevel {
53-
pub fn single() -> IndentLevel {
53+
pub fn zero() -> IndentLevel {
5454
IndentLevel(0)
5555
}
5656
pub fn is_zero(&self) -> bool {

crates/syntax/src/ast/edit_in_place.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ impl ast::AssocItemList {
591591
normalize_ws_between_braces(self.syntax());
592592
(IndentLevel::from_token(&l_curly) + 1, ted::Position::after(&l_curly), "\n")
593593
}
594-
None => (IndentLevel::single(), ted::Position::last_child_of(self.syntax()), "\n"),
594+
None => (IndentLevel::zero(), ted::Position::last_child_of(self.syntax()), "\n"),
595595
},
596596
};
597597
let elements: Vec<SyntaxElement> = vec![

crates/syntax/src/syntax_editor/edits.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ impl ast::AssocItemList {
210210
normalize_ws_between_braces(editor, self.syntax());
211211
(IndentLevel::from_token(&l_curly) + 1, Position::after(&l_curly), "\n")
212212
}
213-
None => (IndentLevel::single(), Position::last_child_of(self.syntax()), "\n"),
213+
None => (IndentLevel::zero(), Position::last_child_of(self.syntax()), "\n"),
214214
},
215215
};
216216

@@ -242,7 +242,7 @@ impl ast::VariantList {
242242
normalize_ws_between_braces(editor, self.syntax());
243243
(IndentLevel::from_token(&l_curly) + 1, Position::after(&l_curly))
244244
}
245-
None => (IndentLevel::single(), Position::last_child_of(self.syntax())),
245+
None => (IndentLevel::zero(), Position::last_child_of(self.syntax())),
246246
},
247247
};
248248
let elements: Vec<SyntaxElement> = vec![

0 commit comments

Comments
 (0)