diff --git a/spec/compiler/parser/to_s_spec.cr b/spec/compiler/parser/to_s_spec.cr
index 42dc1091cfae..abb3d260a460 100644
--- a/spec/compiler/parser/to_s_spec.cr
+++ b/spec/compiler/parser/to_s_spec.cr
@@ -623,4 +623,44 @@ describe "ASTNode#to_s" do
       }
     %}
     CR
+
+  expect_to_s <<-'CR'
+    {%
+      vals = "foo".strip.strip.strip
+    %}
+    CR
+
+  expect_to_s <<-'CR'
+    {%
+      vals = "foo".strip.strip
+        .strip
+    %}
+    CR
+
+  expect_to_s <<-'CR'
+    {%
+      vals = "foo"
+        .strip
+        .strip.strip
+    %}
+    CR
+
+  expect_to_s <<-'CR'
+    {%
+      vals = [4, 1, 12]
+        .sort_by do |v| v end
+        .map do |v| v end
+    %}
+    CR
+
+  expect_to_s <<-'CR'
+    {%
+      vals = [4, 1, 12]
+        .sort_by do |v| v end
+        .join
+        .strip
+        .chars
+        .map do |v| v end
+    %}
+    CR
 end
diff --git a/src/compiler/crystal/syntax/to_s.cr b/src/compiler/crystal/syntax/to_s.cr
index dd9c7eb7ad28..c6bf5d85f939 100644
--- a/src/compiler/crystal/syntax/to_s.cr
+++ b/src/compiler/crystal/syntax/to_s.cr
@@ -439,6 +439,7 @@ module Crystal
       end
 
       need_parens = need_parens(node_obj)
+      is_multiline = false
 
       @str << "::" if node.global?
       if node_obj.is_a?(ImplicitObj)
@@ -490,7 +491,17 @@ module Crystal
         in_parenthesis(need_parens(arg), arg)
       else
         if node_obj
+          # A call is multiline if the call's name is on a diff line than the obj it's being called on.
+          is_multiline = (node_obj_end_loc = node_obj.end_location) && (name_loc = node.name_end_location) && (name_loc.line_number > node_obj_end_loc.line_number)
+
           in_parenthesis(need_parens, node_obj)
+
+          if is_multiline
+            newline
+            @indent += 1
+            append_indent
+          end
+
           @str << '.'
         end
         if Lexer.setter?(node.name)
@@ -516,6 +527,8 @@ module Crystal
         block.accept self
       end
 
+      @indent -= 1 if is_multiline
+
       false
     end