[ruby/prism] Reject argument command call taking a block with more trailing arguments

https://bugs.ruby-lang.org/issues/21168#note-5

The added code samples align with `parse.y`, except for `foo(bar baz do end)` which `parse.y` currently rejects but shouldn't.

ruby/prism@3a4e102d80

Author: Earlopain

prism/prism.c

@@ -14443,6 +14443,17 @@ parse_arguments(pm_parser_t *parser, pm_arguments_t *arguments, bool accepts_for
             if (accepted_newline) {
                 pm_parser_err_previous(parser, PM_ERR_INVALID_COMMA);
             }
+
+            // If this is a command call and an argument takes a block,
+            // there can be no further arguments. For example,
+            // `foo(bar 1 do end, 2)` should be rejected.
+            if (PM_NODE_TYPE_P(argument, PM_CALL_NODE)) {
+                pm_call_node_t *call = (pm_call_node_t *) argument;
+                if (call->opening_loc.start == NULL && call->arguments != NULL && call->block != NULL) {
+                    pm_parser_err_previous(parser, PM_ERR_INVALID_COMMA);
+                    break;
+                }
+            }
         } else {
             // If there is no comma at the end of the argument list then we're
             // done parsing arguments and can break out of this loop.

test/prism/errors/command_calls.txt

@@ -1,3 +1,10 @@
 [a b]
   ^ unexpected local variable or method; expected a `,` separator for the array elements
 
+
+[
+  a b do
+   ^ unexpected local variable or method; expected a `,` separator for the array elements
+  end,
+]
+

test/prism/errors/command_calls_34.txt

@@ -0,0 +1,24 @@
+foo(bar 1 do end, 2)
+                ^ invalid comma
+                  ^ unexpected integer; expected a `)` to close the arguments
+                  ^ unexpected integer, expecting end-of-input
+                   ^ unexpected ')', expecting end-of-input
+                   ^ unexpected ')', ignoring it
+
+foo(bar 1 do end,)
+                ^ invalid comma
+
+foo(1, bar 2 do end)
+           ^ unexpected integer; expected a `)` to close the arguments
+           ^ unexpected integer, expecting end-of-input
+             ^~ unexpected 'do', expecting end-of-input
+             ^~ unexpected 'do', ignoring it
+                ^~~ unexpected 'end', ignoring it
+                   ^ unexpected ')', ignoring it
+
+foo(1, bar 2)
+           ^ unexpected integer; expected a `)` to close the arguments
+           ^ unexpected integer, expecting end-of-input
+            ^ unexpected ')', expecting end-of-input
+            ^ unexpected ')', ignoring it
+

test/prism/fixtures/command_method_call_2.txt

@@ -0,0 +1,3 @@
+foo(bar baz do end)
+
+foo(bar baz, bat)

test/prism/fixtures_test.rb

@@ -27,6 +27,8 @@ class FixturesTest < TestCase
     # Leaving these out until they are supported by parse.y.
     except << "leading_logical.txt"
     except << "endless_methods_command_call.txt"
+    # https://bugs.ruby-lang.org/issues/21168#note-5
+    except << "command_method_call_2.txt"
 
     Fixture.each(except: except) do |fixture|
       define_method(fixture.test_name) { assert_valid_syntax(fixture.read) }

test/prism/lex_test.rb

@@ -48,6 +48,9 @@ class LexTest < TestCase
     # https://bugs.ruby-lang.org/issues/17398#note-12
     except << "endless_methods_command_call.txt"
 
+    # https://bugs.ruby-lang.org/issues/21168#note-5
+    except << "command_method_call_2.txt"
+
     Fixture.each(except: except) do |fixture|
       define_method(fixture.test_name) { assert_lex(fixture) }
     end

test/prism/ruby/parser_test.rb

@@ -70,6 +70,9 @@ class ParserTest < TestCase
 
       # Ruby >= 3.5 specific syntax
       "endless_methods_command_call.txt",
+
+      # https://bugs.ruby-lang.org/issues/21168#note-5
+      "command_method_call_2.txt",
     ]
 
     # These files contain code that is being parsed incorrectly by the parser

test/prism/ruby/ripper_test.rb

@@ -33,6 +33,9 @@ class RipperTest < TestCase
 
       # https://bugs.ruby-lang.org/issues/17398#note-12
       "endless_methods_command_call.txt",
+
+      # https://bugs.ruby-lang.org/issues/21168#note-5
+      "command_method_call_2.txt",
     ]
 
     # Skip these tests that we haven't implemented yet.

test/prism/ruby/ruby_parser_test.rb

@@ -79,6 +79,9 @@ class RubyParserTest < TestCase
 
       # Ruby >= 3.5 specific syntax
       "endless_methods_command_call.txt",
+
+      # https://bugs.ruby-lang.org/issues/21168#note-5
+      "command_method_call_2.txt",
     ]
 
     Fixture.each(except: failures) do |fixture|