Handle properly stringifying single line blocks

Author: Blacksmoke16

spec/compiler/crystal/tools/playground_spec.cr

@@ -8,11 +8,11 @@ private def instrument(source)
   instrumented.to_s
 end
 
-private def assert_agent(source, expected)
+private def assert_agent(source, expected, *, file : String = __FILE__, line : Int32 = __LINE__)
   # parse/to_s expected so block syntax and spaces do not bother
   expected = Parser.new(expected).parse.to_s
 
-  instrument(source).should contain(expected)
+  instrument(source).should contain(expected), file: file, line: line
 
   # whatever case should work before it should work with appended lines
   instrument("#{source}\n1\n").should contain(expected)
@@ -520,11 +520,7 @@ describe Playground::AgentInstrumentorTransformer do
             _p.i(5) { 'b' }
           end
         end
-        _p.i(7) do
-          baz do
-            'c'
-          end
-        end
+        _p.i(7) { baz { 'c' } }
       end
     end
     CRYSTAL

spec/compiler/normalize/array_literal_spec.cr

@@ -82,9 +82,7 @@ describe "Normalize: array literal" do
       __temp_2 = [2]
       __temp_3 = Foo.new
       __temp_3 << __temp_1
-      __temp_2.each do |__temp_4|
-        __temp_3 << __temp_4
-      end
+      __temp_2.each { |__temp_4| __temp_3 << __temp_4 }
       __temp_3
       CRYSTAL
   end
@@ -95,9 +93,7 @@ describe "Normalize: array literal" do
       __temp_2 = [2]
       __temp_3 = Foo(typeof(__temp_1, ::Enumerable.element_type(__temp_2))).new
       __temp_3 << __temp_1
-      __temp_2.each do |__temp_4|
-        __temp_3 << __temp_4
-      end
+      __temp_2.each { |__temp_4| __temp_3 << __temp_4 }
       __temp_3
       CRYSTAL
   end

spec/compiler/parser/to_s_spec.cr

@@ -52,7 +52,7 @@ describe "ASTNode#to_s" do
   expect_to_s %(foo &.bar), %(foo(&.bar))
   expect_to_s %(foo &.bar(1, 2, 3)), %(foo(&.bar(1, 2, 3)))
   expect_to_s %(foo x: 1, y: 2, &.bar), %(foo(x: 1, y: 2, &.bar))
-  expect_to_s %(foo { |i| i.bar { i } }), "foo do |i|\n  i.bar do\n    i\n  end\nend"
+  expect_to_s %(foo { |i| i.bar { i } })
   expect_to_s %(foo do |k, v|\n  k.bar(1, 2, 3)\nend)
   expect_to_s %(foo(3, &.*(2)))
   expect_to_s %(return begin\n  1\n  2\nend)
@@ -108,6 +108,16 @@ describe "ASTNode#to_s" do
   expect_to_s "def foo(x, @[Foo] **args)\nend"
   expect_to_s "def foo(x, **args, &block)\nend"
   expect_to_s "def foo(@[Foo] x, @[Bar] **args, @[Baz] &block)\nend"
+  expect_to_s "{% [1, 2, 3].each { |v| pp(v) } %}"
+  expect_to_s "{%\n  [1, 2, 3].each { |v| pp(v) }\n%}"
+  expect_to_s "{% [1, 2, 3].find(&.!.even?) %}", "{% [1, 2, 3].find() { |__arg0| !__arg0.even? } %}"
+  expect_to_s <<-'CR'
+    {%
+      [1, 2, 3].find do |e|
+        e.even?
+      end
+    %}
+    CR
 
   # 14216
   expect_to_s "def foo(x, **args, &block : _ -> _)\nend"
@@ -458,12 +468,14 @@ describe "ASTNode#to_s" do
   expect_to_s "->::foo(Int32, String)"
   expect_to_s "->::Foo::Bar.foo"
   expect_to_s "yield(1)"
-  expect_to_s "foo { |(x, y)| x }", <<-CODE
+  expect_to_s "foo { |(x, y)| x }"
+  expect_to_s "foo do |(x, y)|\n  x\nend", <<-CODE
     foo do |(x, y)|
       x
     end
     CODE
-  expect_to_s "foo { |(x, (y, z))| x }", <<-CODE
+  expect_to_s "foo { |(x, (y, z))| x }"
+  expect_to_s "foo do |(x, (y, z))|\n  x\nend", <<-CODE
     foo do |(x, (y, z))|
       x
     end

src/compiler/crystal/syntax/to_s.cr

@@ -1111,18 +1111,19 @@ module Crystal
     end
 
     def visit(node : Block)
-      @str << "do"
+      # If the node's body end location is on the same line as the start of the block itself, it's on a single line.
+      single_line_block = (node_loc = node.location) && (end_loc = node.body.end_location) && end_loc.line_number == node_loc.line_number
+
+      @str << (single_line_block ? '{' : "do")
 
       unless node.args.empty?
         @str << " |"
         node.args.each_with_index do |arg, i|
           @str << ", " if i > 0
           @str << '*' if i == node.splat_index
-
           if arg.name == ""
             # This is an unpack
             unpack = node.unpacks.not_nil![i]
-
             visit_unpack(unpack)
           else
             arg.accept self
@@ -1131,11 +1132,21 @@ module Crystal
         @str << '|'
       end
 
-      newline
-      accept_with_indent(node.body)
+      @str << ' ' if single_line_block
 
-      append_indent
-      @str << "end"
+      if single_line_block
+        node.body.accept self
+      else
+        newline
+        accept_with_indent node.body
+      end
+
+      if single_line_block
+        @str << ' ' << '}'
+      else
+        append_indent
+        @str << "end"
+      end
 
       false
     end

src/compiler/crystal/tools/playground/agent_instrumentor_transformer.cr

@@ -77,7 +77,7 @@ module Crystal
         if node.is_a?(TupleLiteral)
           args << ArrayLiteral.new(node.elements.map { |e| StringLiteral.new(e.to_s).as(ASTNode) })
         end
-        call = Call.new(Call.new("_p"), "i", args, Block.new([] of Var, node.as(ASTNode)))
+        call = Call.new(Call.new("_p"), "i", args, Block.new([] of Var, node.as(ASTNode)).at(node))
         call = Cast.new(call, TypeOf.new([node.clone] of ASTNode)) if add_as_typeof
         call = Splat.new(call) if splat
         call
@@ -98,7 +98,7 @@ module Crystal
       node.values = if node.values.size == 1
                       [instrument(node.values[0])] of ASTNode
                     else
-                      rhs = TupleLiteral.new(node.values)
+                      rhs = TupleLiteral.new(node.values).at(node)
                       rhs.location = node.location
                       [instrument(rhs)] of ASTNode
                     end
@@ -145,7 +145,7 @@ module Crystal
     end
 
     private def instrument_args_and_splat(node : Call)
-      args = TupleLiteral.new(node.args)
+      args = TupleLiteral.new(node.args).at(node)
       args.location = node.location
       node.args = [Splat.new(instrument(args))] of ASTNode
       node