Fix bug wit R arguments and incidental multiple matches (#3064)

AndreasArvidsson · web-flow · commit 9cb2a3b7a972 · 2025-08-11T04:59:56.000+02:00
Fixes <img width="628" height="263" alt="image" src="https://github.com/user-attachments/assets/1fdd134e-3e53-4949-9182-179057b68aad" />
diff --git a/queries/r.scm b/queries/r.scm
@@ -43,13 +43,15 @@
   (arguments
     (
       (argument) @_.leading.endOf
+      .
       (comma)
     )?
     .
     (argument) @argumentOrParameter
     .
     (
       (comma)
+      .
       (argument) @_.trailing.startOf
     )?
   ) @_dummy
@@ -63,13 +65,15 @@
   (parameters
     (
       (parameter) @_.leading.endOf
+      .
       (comma)
     )?
     .
     (parameter) @argumentOrParameter
     .
     (
       (comma)
+      .
       (parameter) @_.trailing.startOf
     )?
   ) @_dummy

Original file line number	Diff line number	Diff line change
`@@ -43,13 +43,15 @@`
`43`	`43`	`(arguments`
`44`	`44`	`(`
`45`	`45`	`(argument) @_.leading.endOf`
	`46`	`+ .`
`46`	`47`	`(comma)`
`47`	`48`	`)?`
`48`	`49`	`.`
`49`	`50`	`(argument) @argumentOrParameter`
`50`	`51`	`.`
`51`	`52`	`(`
`52`	`53`	`(comma)`
	`54`	`+ .`
`53`	`55`	`(argument) @_.trailing.startOf`
`54`	`56`	`)?`
`55`	`57`	`) @_dummy`
`@@ -63,13 +65,15 @@`
`63`	`65`	`(parameters`
`64`	`66`	`(`
`65`	`67`	`(parameter) @_.leading.endOf`
	`68`	`+ .`
`66`	`69`	`(comma)`
`67`	`70`	`)?`
`68`	`71`	`.`
`69`	`72`	`(parameter) @argumentOrParameter`
`70`	`73`	`.`
`71`	`74`	`(`
`72`	`75`	`(comma)`
	`76`	`+ .`
`73`	`77`	`(parameter) @_.trailing.startOf`
`74`	`78`	`)?`
`75`	`79`	`) @_dummy`