Merge #526

526: fix indent caclulation r=matklad a=matklad



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

crates/ra_ide_api_light/src/formatting.rs

@@ -2,15 +2,23 @@ use ra_syntax::{
     AstNode,
     SyntaxNode, SyntaxKind::*,
     ast::{self, AstToken},
+    algo::generate,
 };
 
 /// If the node is on the begining of the line, calculate indent.
 pub(crate) fn leading_indent(node: &SyntaxNode) -> Option<&str> {
-    let prev = node.prev_sibling()?;
+    let prev = prev_leaf(node)?;
     let ws_text = ast::Whitespace::cast(prev)?.text();
     ws_text.rfind('\n').map(|pos| &ws_text[pos + 1..])
 }
 
+fn prev_leaf(node: &SyntaxNode) -> Option<&SyntaxNode> {
+    generate(node.ancestors().find_map(SyntaxNode::prev_sibling), |it| {
+        it.last_child()
+    })
+    .last()
+}
+
 pub(crate) fn extract_trivial_expression(block: &ast::Block) -> Option<&ast::Expr> {
     let expr = block.expr()?;
     if expr.syntax().text().contains('\n') {

crates/ra_ide_api_light/src/typing.rs

@@ -227,6 +227,38 @@ fn foo() {
         )
     }
 
+    #[test]
+    fn indents_new_chain_call_with_semi() {
+        type_dot(
+            r"
+            pub fn child(&self, db: &impl HirDatabase, name: &Name) -> Cancelable<Option<Module>> {
+                self.child_impl(db, name)
+                <|>;
+            }
+            ",
+            r"
+            pub fn child(&self, db: &impl HirDatabase, name: &Name) -> Cancelable<Option<Module>> {
+                self.child_impl(db, name)
+                    .;
+            }
+            ",
+        );
+        type_dot(
+            r"
+            pub fn child(&self, db: &impl HirDatabase, name: &Name) -> Cancelable<Option<Module>> {
+                self.child_impl(db, name)
+                    <|>;
+            }
+            ",
+            r"
+            pub fn child(&self, db: &impl HirDatabase, name: &Name) -> Cancelable<Option<Module>> {
+                self.child_impl(db, name)
+                    .;
+            }
+            ",
+        )
+    }
+
     #[test]
     fn indents_continued_chain_call() {
         type_dot(

crates/test_utils/src/lib.rs

@@ -12,18 +12,18 @@ pub const CURSOR_MARKER: &str = "<|>";
 
 #[macro_export]
 macro_rules! assert_eq_text {
-    ($expected:expr, $actual:expr) => {
+    ($left:expr, $right:expr) => {
-        assert_eq_text!($expected, $actual,)
+        assert_eq_text!($left, $right,)
     };
-    ($expected:expr, $actual:expr, $($tt:tt)*) => {{
+    ($left:expr, $right:expr, $($tt:tt)*) => {{
-        let expected = $expected;
+        let left = $left;
-        let actual = $actual;
+        let right = $right;
-        if expected != actual {
+        if left != right {
-            if expected.trim() == actual.trim() {
+            if left.trim() == right.trim() {
-                eprintln!("Expected:\n{:?}\n\nActual:\n{:?}\n\nWhitespace difference\n", expected, actual);
+                eprintln!("Left:\n{:?}\n\nRight:\n{:?}\n\nWhitespace difference\n", left, right);
             } else {
-                let changeset = $crate::__Changeset::new(actual, expected, "\n");
+                let changeset = $crate::__Changeset::new(right, left, "\n");
-                eprintln!("Expected:\n{}\n\nActual:\n{}\n\nDiff:\n{}\n", expected, actual, changeset);
+                eprintln!("Left:\n{}\n\nRight:\n{}\n\nDiff:\n{}\n", left, right, changeset);
             }
             eprintln!($($tt)*);
             panic!("text differs");