Implementing missing java scopes

Author: AndreasArvidsson

data/fixtures/scopes/java/class.iteration.block.scope

@@ -0,0 +1,27 @@
+public class MyClass {
+
+}
+---
+
+[#1 Range] =
+[#1 Domain] = 0:0-2:1
+  >----------------------
+0| public class MyClass {
+1|
+2| }
+   -<
+
+
+[#2 Range] = 0:22-2:0
+                        >
+0| public class MyClass {
+1|
+2| }
+   <
+
+[#2 Domain] = 0:21-2:1
+                       >-
+0| public class MyClass {
+1|
+2| }
+   -<

data/fixtures/scopes/java/class.iteration.document.scope

@@ -0,0 +1,17 @@
+
+public class MyClass { }
+---
+
+[#1 Range] =
+[#1 Domain] = 1:0-1:24
+  >------------------------<
+1| public class MyClass { }
+
+
+[#2 Range] = 1:22-1:23
+                        >-<
+1| public class MyClass { }
+
+[#2 Domain] = 1:21-1:24
+                       >---<
+1| public class MyClass { }

data/fixtures/scopes/java/className.iteration.block.scope

@@ -0,0 +1,27 @@
+public class MyClass {
+
+}
+---
+
+[#1 Range] =
+[#1 Domain] = 0:0-2:1
+  >----------------------
+0| public class MyClass {
+1|
+2| }
+   -<
+
+
+[#2 Range] = 0:22-2:0
+                        >
+0| public class MyClass {
+1|
+2| }
+   <
+
+[#2 Domain] = 0:21-2:1
+                       >-
+0| public class MyClass {
+1|
+2| }
+   -<

data/fixtures/scopes/java/className.iteration.document.scope

@@ -0,0 +1,17 @@
+
+public class MyClass { }
+---
+
+[#1 Range] =
+[#1 Domain] = 1:0-1:24
+  >------------------------<
+1| public class MyClass { }
+
+
+[#2 Range] = 1:22-1:23
+                        >-<
+1| public class MyClass { }
+
+[#2 Domain] = 1:21-1:24
+                       >---<
+1| public class MyClass { }

packages/common/src/scopeSupportFacets/java.ts

@@ -35,7 +35,12 @@ export const javaScopeSupport: LanguageScopeSupportFacetMap = {
   "branch.ternary": supported,
 
   class: supported,
+  "class.iteration.block": supported,
+  "class.iteration.document": supported,
+
   className: supported,
+  "className.iteration.block": supported,
+  "className.iteration.document": supported,
 
   "comment.block": supported,
   "comment.line": supported,
@@ -100,11 +105,6 @@ export const javaScopeSupport: LanguageScopeSupportFacetMap = {
 
   // Unsupported
 
-  "class.iteration.block": unsupported,
-  "class.iteration.document": unsupported,
-  "className.iteration.block": unsupported,
-  "className.iteration.document": unsupported,
-
   "name.iteration.document": unsupported,
   "name.iteration.block": unsupported,
   "name.resource": unsupported,

queries/java.scm

@@ -42,6 +42,15 @@
   name: (_) @name @className
 ) @class @_.domain
 
+(program) @class.iteration @className.iteration
+
+(class_body
+  .
+  "{" @class.iteration.start.endOf @className.iteration.start.endOf
+  "}" @class.iteration.end.startOf @className.iteration.end.startOf
+  .
+) @class.iteration.domain @className.iteration.domain
+
 ;;!! void myFunk() {}
 ;;!  ^^^^^^^^^^^^^^^^
 (method_declaration