chore: allow named ellipsis for stmts and exp, add tests

semgrep · Dec 19, 2023 · b43d552 · b43d552
1 parent 44699c4
commit b43d552
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 28 deletions.
diff --git a/lang/semgrep-grammars/src/semgrep-java/grammar.js b/lang/semgrep-grammars/src/semgrep-java/grammar.js
@@ -51,11 +51,13 @@ module.exports = grammar(base_grammar, {
     primary_expression: ($, previous) => choice(
       previous,
       $.semgrep_ellipsis,
+      $.semgrep_named_ellipsis
     ),
 
     statement: ($, previous) => choice(
       previous,
       $.semgrep_ellipsis,
+      $.semgrep_named_ellipsis
     ),
 
     formal_parameter: ($, previous) => choice(
@@ -66,7 +68,8 @@ module.exports = grammar(base_grammar, {
 
     _class_body_declaration: ($, previous) => choice(
       previous,
-      $.semgrep_ellipsis
+      $.semgrep_ellipsis,
+      $.semgrep_named_ellipsis
     ),
 
     partials: $ => choice(

diff --git a/lang/semgrep-grammars/src/semgrep-java/test/corpus/semgrep.txt b/lang/semgrep-grammars/src/semgrep-java/test/corpus/semgrep.txt
@@ -19,16 +19,16 @@ bar();
 
 --------------------------------------------------------------------------------
 
-  (program
-    (expression_statement
-      (method_invocation
-        (identifier)
-        (argument_list)))
-    (semgrep_ellipsis)
-    (expression_statement
-      (method_invocation
-        (identifier)
-        (argument_list))))
+(program
+  (expression_statement
+    (method_invocation
+      (identifier)
+      (argument_list)))
+  (semgrep_ellipsis)
+  (expression_statement
+    (method_invocation
+      (identifier)
+      (argument_list))))
 
 ================================================================================
 Top level public constructor
@@ -72,15 +72,16 @@ public record $R(...) {
 }
 
 --------------------------------------------------------------------------------
+
 (program
-      (record_declaration
-        (modifiers)
-        (identifier)
-        (formal_parameters
-          (formal_parameter
-            (semgrep_ellipsis)))
-        (class_body
-          (semgrep_ellipsis))))
+  (record_declaration
+    (modifiers)
+    (identifier)
+    (formal_parameters
+      (formal_parameter
+        (semgrep_ellipsis)))
+    (class_body
+      (semgrep_ellipsis))))
 
 ================================================================================
 Method header
@@ -91,14 +92,14 @@ public int foo(...)
 --------------------------------------------------------------------------------
 
 (program
-      (partials
-        (partial_method
-          (modifiers)
-          (integral_type)
-          (identifier)
-          (formal_parameters
-            (formal_parameter
-              (semgrep_ellipsis))))))
+  (partials
+    (partial_method
+      (modifiers)
+      (integral_type)
+      (identifier)
+      (formal_parameters
+        (formal_parameter
+          (semgrep_ellipsis))))))
 
 ================================================================================
 Constructor body ellipsis
@@ -185,7 +186,7 @@ class $X {
               (identifier))))))))
 
 ================================================================================
-Metavariable ellipsis parameter
+Named ellipsis parameter
 ================================================================================
 
 class $X {
@@ -206,3 +207,38 @@ class $X {
           (formal_parameter
             (semgrep_named_ellipsis)))
         (block)))))
+
+================================================================================
+Named ellipsis statements
+================================================================================
+
+foo();
+$...STMTS
+bar();
+
+--------------------------------------------------------------------------------
+
+(program
+  (expression_statement
+    (method_invocation
+      (identifier)
+      (argument_list)))
+  (semgrep_named_ellipsis)
+  (expression_statement
+    (method_invocation
+      (identifier)
+      (argument_list))))
+
+================================================================================
+Named ellipsis expression
+================================================================================
+
+1 + $...NAMED;
+
+--------------------------------------------------------------------------------
+
+(program
+  (expression_statement
+    (binary_expression
+      (decimal_integer_literal)
+      (semgrep_named_ellipsis))))