type argument iteration

Author: AndreasArvidsson

data/fixtures/scopes/java/type.formal.constructor.iteration.scope

@@ -0,0 +1,12 @@
+public class MyClass {
+    public MyClass(String name, int age) {}
+}
+---
+
+[Range] = 1:19-1:39
+                     >--------------------<
+1|     public MyClass(String name, int age) {}
+
+[Domain] = 1:4-1:43
+      >---------------------------------------<
+1|     public MyClass(String name, int age) {}

data/fixtures/scopes/java/type.formal.method.iteration.scope

@@ -0,0 +1,12 @@
+public class MyClass {
+    public void foo(String name, int age) {}
+}
+---
+
+[Range] = 1:20-1:40
+                      >--------------------<
+1|     public void foo(String name, int age) {}
+
+[Domain] = 1:4-1:44
+      >----------------------------------------<
+1|     public void foo(String name, int age) {}

packages/common/src/scopeSupportFacets/java.ts

@@ -98,6 +98,8 @@ export const javaScopeSupport: LanguageScopeSupportFacetMap = {
 
   "type.argument.formal.constructor": supported,
   "type.argument.formal.method": supported,
+  "type.argument.formal.constructor.iteration": supported,
+  "type.argument.formal.method.iteration": supported,
   "type.foreach": supported,
   "type.field": supported,
   "type.field.iteration": supported,
@@ -117,8 +119,6 @@ export const javaScopeSupport: LanguageScopeSupportFacetMap = {
 
   // Unsupported
 
-  "type.argument.formal.constructor.iteration": unsupported,
-  "type.argument.formal.method.iteration": unsupported,
   "type.cast": unsupported,
   "type.class": unsupported,
   "type.enum": unsupported,

queries/java.scm

@@ -289,10 +289,10 @@
 ;;!              ^^^^^^^^^
 (formal_parameters
   .
-  "(" @name.iteration.start.endOf
-  ")" @name.iteration.end.startOf
+  "(" @type.iteration.start.endOf @name.iteration.start.endOf
+  ")" @type.iteration.end.startOf @name.iteration.end.startOf
   .
-) @name.iteration.domain
+) @type.iteration.domain @name.iteration.domain
 
 ;;!! Map<String, String>
 ;;!     ^^^^^^^  ^^^^^^