Statement iteration

Author: AndreasArvidsson

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

@@ -43,3 +43,9 @@ public class MyClass {
 2|     if (true) { }
 3|    }
    ---<
+
+
+[#5 Range] =
+[#5 Domain] = 2:15-2:16
+                 >-<
+2|     if (true) { }

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

@@ -0,0 +1,52 @@
+public class MyClass {
+   public void myFunk() {
+    if (true) { }
+    while (true) { }
+   }
+}
+---
+
+[#1 Range] =
+[#1 Domain] = 0:0-5:1
+  >----------------------
+0| public class MyClass {
+1|    public void myFunk() {
+2|     if (true) { }
+3|     while (true) { }
+4|    }
+5| }
+   -<
+
+
+[#2 Range] =
+[#2 Domain] = 0:22-5:0
+                        >
+0| public class MyClass {
+1|    public void myFunk() {
+2|     if (true) { }
+3|     while (true) { }
+4|    }
+5| }
+   <
+
+
+[#3 Range] =
+[#3 Domain] = 1:25-4:3
+                           >
+1|    public void myFunk() {
+2|     if (true) { }
+3|     while (true) { }
+4|    }
+   ---<
+
+
+[#4 Range] =
+[#4 Domain] = 2:15-2:16
+                 >-<
+2|     if (true) { }
+
+
+[#5 Range] =
+[#5 Domain] = 3:18-3:19
+                    >-<
+3|     while (true) { }

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

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

packages/common/src/scopeSupportFacets/java.ts

@@ -85,6 +85,8 @@ export const javaScopeSupport: LanguageScopeSupportFacetMap = {
   ifStatement: supported,
   statement: supported,
   "statement.class": supported,
+  "statement.iteration.block": supported,
+  "statement.iteration.document": supported,
 
   "string.singleLine": supported,
   "string.multiLine": supported,
@@ -133,9 +135,6 @@ export const javaScopeSupport: LanguageScopeSupportFacetMap = {
   "interior.ternary": unsupported,
   "interior.try": unsupported,
 
-  "statement.iteration.block": unsupported,
-  "statement.iteration.document": unsupported,
-
   fieldAccess: unsupported,
 
   // Not Applicable

queries/java.scm

@@ -43,14 +43,46 @@
 ) @class @_.domain
 
 (program) @class.iteration @className.iteration @name.iteration
+(program) @statement.iteration
 
+;;!! class MyClass { }
+;;!                 ^
 (class_body
   .
   "{" @class.iteration.start.endOf @className.iteration.start.endOf
   "}" @class.iteration.end.startOf @className.iteration.end.startOf
   .
 ) @class.iteration.domain @className.iteration.domain
 
+(class_body
+  .
+  "{" @type.iteration.start.endOf @namedFunction.iteration.start.endOf @functionName.iteration.start.endOf
+  "}" @type.iteration.end.startOf @namedFunction.iteration.end.startOf @functionName.iteration.end.startOf
+  .
+)
+
+;;!! for (...) { }
+;;!             ^
+(_
+  body: (_
+    .
+    "{" @name.iteration.start.endOf @statement.iteration.start.endOf
+    "}" @name.iteration.end.startOf @statement.iteration.end.startOf
+    .
+  )
+)
+
+;;!! if (true) { }
+;;!             ^
+(if_statement
+  (block
+    .
+    "{" @name.iteration.start.endOf @statement.iteration.start.endOf
+    "}" @name.iteration.end.startOf @statement.iteration.end.startOf
+    .
+  )
+)
+
 ;;!! void myFunk() {}
 ;;!  ^^^^^^^^^^^^^^^^
 (method_declaration
@@ -435,24 +467,6 @@
   type: (_) @type
 ) @_.domain
 
-;;!! class MyClass { }
-;;!                 ^
-(class_body
-  .
-  "{" @type.iteration.start.endOf @namedFunction.iteration.start.endOf @functionName.iteration.start.endOf
-  "}" @type.iteration.end.startOf @namedFunction.iteration.end.startOf @functionName.iteration.end.startOf
-  .
-)
-
-(_
-  body: (_
-    .
-    "{" @name.iteration.start.endOf
-    "}" @name.iteration.end.startOf
-    .
-  )
-)
-
 ;;!! public Map<int, int> foo;
 ;;!             ^^^  ^^^
 (type_arguments