Fix end location of call with block arg and no parentheses

crystal-lang · Feb 22, 2025 · 9679f1e · 9679f1e
1 parent c29083a
commit 9679f1e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/spec/compiler/parser/parser_spec.cr b/spec/compiler/parser/parser_spec.cr
@@ -2372,6 +2372,10 @@ module Crystal
       assert_end_location "1 ensure 2"
       assert_end_location "foo.bar= *baz"
       assert_end_location %("hello "\\\n"world"), line_number: 2, column_number: 7
+      assert_end_location "foo(&.bar)"
+      assert_end_location "foo &.bar"
+      assert_end_location "foo(&bar)"
+      assert_end_location "foo &bar"
 
       assert_syntax_error %({"a" : 1}), "space not allowed between named argument name and ':'"
       assert_syntax_error %({"a": 1, "b" : 2}), "space not allowed between named argument name and ':'"

diff --git a/src/compiler/crystal/syntax/parser.cr b/src/compiler/crystal/syntax/parser.cr
@@ -1587,12 +1587,12 @@ module Crystal
         call ||= parse_call_block_arg_after_dot(obj)
 
         block = Block.new([Var.new(block_arg_name)], call).at(location)
+        end_location = call.end_location
       else
         block_arg = parse_op_assign
+        end_location = block_arg.end_location
       end
 
-      end_location = token_end_location
-
       if check_paren
         skip_space_or_newline
         check :OP_RPAREN