named function iteration scope

Author: AndreasArvidsson

data/fixtures/scopes/java/functionName.method.iteration.class.scope

@@ -0,0 +1,7 @@
+class MyClass { }
+---
+
+[Range] =
+[Domain] = 0:15-0:16
+                 >-<
+0| class MyClass { }

data/fixtures/scopes/java/namedFunction.method.iteration.class.scope

@@ -0,0 +1,7 @@
+class MyClass { }
+---
+
+[Range] =
+[Domain] = 0:15-0:16
+                 >-<
+0| class MyClass { }

packages/common/src/scopeSupportFacets/java.ts

@@ -59,8 +59,13 @@ export const javaScopeSupport: LanguageScopeSupportFacetMap = {
   functionCallee: supported,
   "functionCallee.constructor": supported,
 
+  "namedFunction.constructor": supported,
+  "namedFunction.method": supported,
+  "namedFunction.method.iteration.class": supported,
+
   "functionName.constructor": supported,
   "functionName.method": supported,
+  "functionName.method.iteration.class": supported,
 
   "name.argument.formal.constructor": supported,
   "name.argument.formal.constructor.iteration": supported,
@@ -73,8 +78,6 @@ export const javaScopeSupport: LanguageScopeSupportFacetMap = {
   "name.foreach": supported,
   "name.method": supported,
   "name.variable": supported,
-  "namedFunction.constructor": supported,
-  "namedFunction.method": supported,
 
   ifStatement: supported,
   statement: supported,
@@ -121,13 +124,6 @@ export const javaScopeSupport: LanguageScopeSupportFacetMap = {
   "value.resource": unsupported,
   "value.resource.iteration": unsupported,
 
-  "namedFunction.iteration.document": unsupported,
-  "namedFunction.method.iteration.class": unsupported,
-
-  "functionName.iteration.block": unsupported,
-  "functionName.iteration.document": unsupported,
-  "functionName.method.iteration.class": unsupported,
-
   "interior.class": unsupported,
   "interior.element": unsupported,
   "interior.function": unsupported,
@@ -189,8 +185,12 @@ export const javaScopeSupport: LanguageScopeSupportFacetMap = {
   "textFragment.element": notApplicable,
 
   namedFunction: notApplicable,
+  "namedFunction.iteration.document": notApplicable,
   "namedFunction.iteration.block": notApplicable,
 
+  "functionName.iteration.document": notApplicable,
+  "functionName.iteration.block": notApplicable,
+
   pairDelimiter: notApplicable,
   functionName: notApplicable,
   map: notApplicable,

queries/java.scm

@@ -432,8 +432,8 @@
 ;;!                 ^
 (class_body
   .
-  "{" @type.iteration.start.endOf
-  "}" @type.iteration.end.startOf
+  "{" @type.iteration.start.endOf @namedFunction.iteration.start.endOf @functionName.iteration.start.endOf
+  "}" @type.iteration.end.startOf @namedFunction.iteration.end.startOf @functionName.iteration.end.startOf
   .
 )