Skip to content

Commit 08694dc

Browse files
committed
minor: address review comments
1 parent 98847e4 commit 08694dc

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

crates/ide_assists/src/handlers/convert_iter_for_each_to_for.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ pub(crate) fn convert_iter_for_each_to_for(acc: &mut Assists, ctx: &AssistContex
4646
let body = closure.body()?;
4747

4848
let stmt = method.syntax().parent().and_then(ast::ExprStmt::cast);
49-
let range = stmt.as_ref().map_or_else(|| method.syntax(), AstNode::syntax).text_range();
49+
let range = stmt.as_ref().map_or(method.syntax(), AstNode::syntax).text_range();
5050

5151
acc.add(
5252
AssistId("convert_iter_for_each_to_for", AssistKind::RefactorRewrite),
@@ -61,7 +61,8 @@ pub(crate) fn convert_iter_for_each_to_for(acc: &mut Assists, ctx: &AssistContex
6161
_ => make::block_expr(Vec::new(), Some(body)),
6262
}
6363
.clone_for_update();
64-
block.reset_indent().indent(indent);
64+
block.reset_indent();
65+
block.indent(indent);
6566

6667
let expr_for_loop = make::expr_for_loop(param, receiver, block);
6768
builder.replace(range, expr_for_loop.to_string())

crates/syntax/src/ast/edit.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ impl IndentLevel {
117117
/// }
118118
/// ```
119119
/// if you indent the block, the `{` token would stay put.
120-
pub(in super) fn increase_indent(self, node: &SyntaxNode) {
120+
pub(super) fn increase_indent(self, node: &SyntaxNode) {
121121
let tokens = node.preorder_with_tokens().filter_map(|event| match event {
122122
rowan::WalkEvent::Leave(NodeOrToken::Token(it)) => Some(it),
123123
_ => None,
@@ -132,7 +132,7 @@ impl IndentLevel {
132132
}
133133
}
134134

135-
pub(in super) fn decrease_indent(self, node: &SyntaxNode) {
135+
pub(super) fn decrease_indent(self, node: &SyntaxNode) {
136136
let tokens = node.preorder_with_tokens().filter_map(|event| match event {
137137
rowan::WalkEvent::Leave(NodeOrToken::Token(it)) => Some(it),
138138
_ => None,

crates/syntax/src/ast/edit_in_place.rs

+4-6
Original file line numberDiff line numberDiff line change
@@ -487,17 +487,15 @@ pub trait Indent: AstNode + Clone + Sized {
487487
fn indent_level(&self) -> IndentLevel {
488488
IndentLevel::from_node(self.syntax())
489489
}
490-
fn indent(&self, level: IndentLevel) -> &Self {
490+
fn indent(&self, level: IndentLevel) {
491491
level.increase_indent(self.syntax());
492-
self
493492
}
494-
fn dedent(&self, level: IndentLevel) -> &Self {
493+
fn dedent(&self, level: IndentLevel) {
495494
level.decrease_indent(self.syntax());
496-
self
497495
}
498-
fn reset_indent(&self) -> &Self {
496+
fn reset_indent(&self) {
499497
let level = IndentLevel::from_node(self.syntax());
500-
self.dedent(level)
498+
self.dedent(level);
501499
}
502500
}
503501

0 commit comments

Comments
 (0)