Unnamed repository; edit this file 'description' to name the repository.
Merge pull request #20601 from A4-Tacks/indent-level-add-assign
Add `ops::AddAssign` implement for IndentLevel
| -rw-r--r-- | crates/ide-assists/src/handlers/unwrap_tuple.rs | 2 | ||||
| -rw-r--r-- | crates/ide-diagnostics/src/handlers/remove_unnecessary_else.rs | 2 | ||||
| -rw-r--r-- | crates/syntax/src/ast/edit.rs | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/crates/ide-assists/src/handlers/unwrap_tuple.rs b/crates/ide-assists/src/handlers/unwrap_tuple.rs index 2345075a52..e03274bbb3 100644 --- a/crates/ide-assists/src/handlers/unwrap_tuple.rs +++ b/crates/ide-assists/src/handlers/unwrap_tuple.rs @@ -33,7 +33,7 @@ pub(crate) fn unwrap_tuple(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option let (ty, init, prefix, suffix) = match &let_stmt { Either::Left(let_stmt) => (let_stmt.ty(), let_stmt.initializer()?, "", ";"), Either::Right(let_expr) => { - indent_level = indent_level + 1; + indent_level += 1; (None, let_expr.expr()?, "&& ", "") } }; diff --git a/crates/ide-diagnostics/src/handlers/remove_unnecessary_else.rs b/crates/ide-diagnostics/src/handlers/remove_unnecessary_else.rs index 7dc5b5b45e..04f48ae3db 100644 --- a/crates/ide-diagnostics/src/handlers/remove_unnecessary_else.rs +++ b/crates/ide-diagnostics/src/handlers/remove_unnecessary_else.rs @@ -48,7 +48,7 @@ fn fixes(ctx: &DiagnosticsContext<'_>, d: &RemoveUnnecessaryElse) -> Option<Vec< let mut indent = IndentLevel::from_node(if_expr.syntax()); let has_parent_if_expr = if_expr.syntax().parent().and_then(ast::IfExpr::cast).is_some(); if has_parent_if_expr { - indent = indent + 1; + indent += 1; } let else_replacement = match if_expr.else_branch()? { ast::ElseBranch::Block(block) => block diff --git a/crates/syntax/src/ast/edit.rs b/crates/syntax/src/ast/edit.rs index 9b30642fe4..194d06900a 100644 --- a/crates/syntax/src/ast/edit.rs +++ b/crates/syntax/src/ast/edit.rs @@ -43,6 +43,12 @@ impl ops::Add<u8> for IndentLevel { } } +impl ops::AddAssign<u8> for IndentLevel { + fn add_assign(&mut self, rhs: u8) { + self.0 += rhs; + } +} + impl IndentLevel { pub fn single() -> IndentLevel { IndentLevel(0) |