Name iteration

Author: AndreasArvidsson

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

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

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

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

data/fixtures/scopes/java/name.argument.formal.constructor.iteration.scope

@@ -3,10 +3,34 @@ public class MyClass {
 }
 ---
 
-[Range] = 1:19-1:41
+[#1 Range] =
+[#1 Domain] = 0:0-2:1
+  >----------------------
+0| public class MyClass {
+1|     public MyClass(String name, int value) { }
+2| }
+   -<
+
+
+[#2 Range] =
+[#2 Domain] = 0:22-2:0
+                        >
+0| public class MyClass {
+1|     public MyClass(String name, int value) { }
+2| }
+   <
+
+
+[#3 Range] = 1:19-1:41
                      >----------------------<
 1|     public MyClass(String name, int value) { }
 
-[Domain] = 1:18-1:42
+[#3 Domain] = 1:18-1:42
                     >------------------------<
 1|     public MyClass(String name, int value) { }
+
+
+[#4 Range] =
+[#4 Domain] = 1:44-1:45
+                                              >-<
+1|     public MyClass(String name, int value) { }

data/fixtures/scopes/java/name.argument.formal.method.iteration.scope

@@ -3,10 +3,34 @@ public class MyClass {
 }
 ---
 
-[Range] = 1:20-1:42
+[#1 Range] =
+[#1 Domain] = 0:0-2:1
+  >----------------------
+0| public class MyClass {
+1|     public void foo(String name, int value) { }
+2| }
+   -<
+
+
+[#2 Range] =
+[#2 Domain] = 0:22-2:0
+                        >
+0| public class MyClass {
+1|     public void foo(String name, int value) { }
+2| }
+   <
+
+
+[#3 Range] = 1:20-1:42
                       >----------------------<
 1|     public void foo(String name, int value) { }
 
-[Domain] = 1:19-1:43
+[#3 Domain] = 1:19-1:43
                      >------------------------<
 1|     public void foo(String name, int value) { }
+
+
+[#4 Range] =
+[#4 Domain] = 1:45-1:46
+                                               >-<
+1|     public void foo(String name, int value) { }

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

@@ -0,0 +1,45 @@
+public class MyClass {
+   public void myFunk() {
+    if (true) { }
+   }
+}
+---
+
+[#1 Range] =
+[#1 Domain] = 0:0-4:1
+  >----------------------
+0| public class MyClass {
+1|    public void myFunk() {
+2|     if (true) { }
+3|    }
+4| }
+   -<
+
+
+[#2 Range] =
+[#2 Domain] = 0:22-4:0
+                        >
+0| public class MyClass {
+1|    public void myFunk() {
+2|     if (true) { }
+3|    }
+4| }
+   <
+
+
+[#3 Range] = 1:22-1:22
+                        ><
+1|    public void myFunk() {
+
+[#3 Domain] = 1:21-1:23
+                       >--<
+1|    public void myFunk() {
+
+
+[#4 Range] =
+[#4 Domain] = 1:25-3:3
+                           >
+1|    public void myFunk() {
+2|     if (true) { }
+3|    }
+   ---<

data/fixtures/scopes/java/name.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

@@ -78,6 +78,8 @@ export const javaScopeSupport: LanguageScopeSupportFacetMap = {
   "name.foreach": supported,
   "name.method": supported,
   "name.variable": supported,
+  "name.iteration.document": supported,
+  "name.iteration.block": supported,
 
   ifStatement: supported,
   statement: supported,
@@ -109,8 +111,6 @@ export const javaScopeSupport: LanguageScopeSupportFacetMap = {
 
   // Unsupported
 
-  "name.iteration.document": unsupported,
-  "name.iteration.block": unsupported,
   "name.resource": unsupported,
   "name.resource.iteration": unsupported,
 

queries/java.scm

@@ -42,7 +42,7 @@
   name: (_) @name @className
 ) @class @_.domain
 
-(program) @class.iteration @className.iteration
+(program) @class.iteration @className.iteration @name.iteration
 
 (class_body
   .
@@ -437,6 +437,15 @@
   .
 )
 
+(_
+  body: (_
+    .
+    "{" @name.iteration.start.endOf
+    "}" @name.iteration.end.startOf
+    .
+  )
+)
+
 ;;!! public Map<int, int> foo;
 ;;!             ^^^  ^^^
 (type_arguments