Merge pull request #650 from tree-sitter/capture-set-reach

fix: take the reach capability in a capture set

Author: exoego

grammar.js

@@ -1685,6 +1685,10 @@ module.exports = grammar({
     capture_ref: $ =>
       seq(
         choice($._identifier, $.stable_identifier, "cap"),
+        // The reach capability `xs*`, which stands for what the elements of
+        // `xs` capture. It comes before the narrowing suffixes. Right before
+        // the closing brace the star arrives as the external token instead.
+        optional(choice($._asterisk, $._postfix_star)),
         repeat(
           seq(
             ".",

test/corpus/types.txt

@@ -546,6 +546,55 @@ def h(x: ->{any} I) = x
           (type_identifier))))
     (identifier)))
 
+================================================================================
+Reach capability in a capture set (Scala 3 capture checking)
+================================================================================
+
+def add(fut: Future[T]^{futs*}) = ???
+
+type F = () ->{c.procs*} Unit
+
+type G = List[() ->{xs*} Unit]
+
+--------------------------------------------------------------------------------
+
+(compilation_unit
+  (function_definition
+    (identifier)
+    (parameters
+      (parameter
+        (identifier)
+        (capturing_type
+          (generic_type
+            (type_identifier)
+            (type_arguments
+              (type_identifier)))
+          (capture_set
+            (capture_ref
+              (identifier))))))
+    (operator_identifier))
+  (type_definition
+    (type_identifier)
+    (function_type
+      (parameter_types)
+      (capture_set
+        (capture_ref
+          (stable_identifier
+            (identifier)
+            (identifier))))
+      (type_identifier)))
+  (type_definition
+    (type_identifier)
+    (generic_type
+      (type_identifier)
+      (type_arguments
+        (function_type
+          (parameter_types)
+          (capture_set
+            (capture_ref
+              (identifier)))
+          (type_identifier))))))
+
 ================================================================================
 Compound types
 ================================================================================