Merge #4388

4388: unindent -> dedent r=matklad a=matklad



bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>

Author: bors[bot]

crates/ra_assists/src/handlers/early_return.rs

@@ -156,7 +156,7 @@ pub(crate) fn convert_to_guarded_return(acc: &mut Assists, ctx: &AssistContext)
             parent_block: &ast::BlockExpr,
             if_expr: &ast::IfExpr,
         ) -> SyntaxNode {
-            let then_block_items = then_block.unindent(IndentLevel::from(1));
+            let then_block_items = then_block.dedent(IndentLevel::from(1));
             let end_of_then = then_block_items.syntax().last_child_or_token().unwrap();
             let end_of_then =
                 if end_of_then.prev_sibling_or_token().map(|n| n.kind()) == Some(WHITESPACE) {

crates/ra_syntax/src/ast/edit.rs

@@ -555,7 +555,7 @@ pub trait AstNodeEdit: AstNode + Clone + Sized {
         Self::cast(indent.increase_indent(self.syntax().clone())).unwrap()
     }
     #[must_use]
-    fn unindent(&self, indent: IndentLevel) -> Self {
+    fn dedent(&self, indent: IndentLevel) -> Self {
         Self::cast(indent.decrease_indent(self.syntax().clone())).unwrap()
     }
 }

crates/test_utils/src/lib.rs

@@ -270,7 +270,7 @@ fn parse_fixture_checks_further_indented_metadata() {
 }
 
 #[test]
-fn parse_fixture_can_handle_unindented_first_line() {
+fn parse_fixture_can_handle_dedented_first_line() {
     let fixture = "//- /lib.rs
                    mod foo;
                    //- /foo.rs