java

Author: AndreasArvidsson

data/fixtures/scopes/java/interior/interior.enum.scope

@@ -0,0 +1,25 @@
+public enum Foo { }
+---
+
+[#1 Content] =
+[#1 Removal] = 0:17-0:18
+                   >-<
+0| public enum Foo { }
+
+[#1 Domain] = 0:0-0:19
+  >-------------------<
+0| public enum Foo { }
+
+[#1 Insertion delimiter] = " "
+
+
+[#2 Content] =
+[#2 Removal] = 0:17-0:18
+                   >-<
+0| public enum Foo { }
+
+[#2 Domain] = 0:16-0:19
+                  >---<
+0| public enum Foo { }
+
+[#2 Insertion delimiter] = " "

data/fixtures/scopes/java/name/name.enum.scope

@@ -0,0 +1,24 @@
+public enum Foo {}
+---
+
+[Content] = 0:12-0:15
+              >---<
+0| public enum Foo {}
+
+[Removal] = 0:12-0:16
+              >----<
+0| public enum Foo {}
+
+[Leading delimiter] = 0:11-0:12
+             >-<
+0| public enum Foo {}
+
+[Trailing delimiter] = 0:15-0:16
+                 >-<
+0| public enum Foo {}
+
+[Domain] = 0:0-0:18
+  >------------------<
+0| public enum Foo {}
+
+[Insertion delimiter] = " "

data/fixtures/scopes/java/name/name.field.enum.scope

@@ -0,0 +1,63 @@
+public enum Foo {
+    bar,
+    baz;
+}
+---
+
+[#1 Content] = 0:12-0:15
+              >---<
+0| public enum Foo {
+
+[#1 Removal] = 0:12-0:16
+              >----<
+0| public enum Foo {
+
+[#1 Leading delimiter] = 0:11-0:12
+             >-<
+0| public enum Foo {
+
+[#1 Trailing delimiter] = 0:15-0:16
+                 >-<
+0| public enum Foo {
+
+[#1 Domain] = 0:0-3:1
+  >-----------------
+0| public enum Foo {
+1|     bar,
+2|     baz;
+3| }
+   -<
+
+[#1 Insertion delimiter] = " "
+
+
+[#2 Content] =
+[#2 Domain] = 1:4-1:7
+      >---<
+1|     bar,
+
+[#2 Removal] = 1:0-1:7
+  >-------<
+1|     bar,
+
+[#2 Leading delimiter] = 1:0-1:4
+  >----<
+1|     bar,
+
+[#2 Insertion delimiter] = " "
+
+
+[#3 Content] =
+[#3 Domain] = 2:4-2:7
+      >---<
+2|     baz;
+
+[#3 Removal] = 2:0-2:7
+  >-------<
+2|     baz;
+
+[#3 Leading delimiter] = 2:0-2:4
+  >----<
+2|     baz;
+
+[#3 Insertion delimiter] = " "

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

@@ -0,0 +1,13 @@
+public enum Foo { }
+---
+
+[#1 Range] =
+[#1 Domain] = 0:0-0:19
+  >-------------------<
+0| public enum Foo { }
+
+
+[#2 Range] =
+[#2 Domain] = 0:17-0:18
+                   >-<
+0| public enum Foo { }

data/fixtures/scopes/java/statement/statement.enum.scope

@@ -0,0 +1,10 @@
+public enum Foo {}
+---
+
+[Content] =
+[Removal] =
+[Domain] = 0:0-0:18
+  >------------------<
+0| public enum Foo {}
+
+[Insertion delimiter] = "\n"

data/fixtures/scopes/java/type/type.enum.scope

@@ -1,15 +1,10 @@
-public enum Value {
-    A;
-}
+public enum Foo {}
 ---
 
 [Content] =
 [Removal] =
-[Domain] = 0:0-2:1
-  >-------------------
-0| public enum Value {
-1|     A;
-2| }
-   -<
+[Domain] = 0:0-0:18
+  >------------------<
+0| public enum Foo {}
 
 [Insertion delimiter] = " "

packages/common/src/scopeSupportFacets/java.ts

@@ -98,6 +98,7 @@ export const javaScopeSupport: LanguageScopeSupportFacetMap = {
   statement: supported,
   "statement.class": supported,
   "statement.interface": supported,
+  "statement.enum": supported,
   "statement.field.class": supported,
   "statement.field.interface": supported,
   "statement.iteration.block": supported,
@@ -121,15 +122,18 @@ export const javaScopeSupport: LanguageScopeSupportFacetMap = {
   "name.assignment": supported,
   "name.class": supported,
   "name.interface": supported,
+  "name.enum": supported,
   "name.constructor": supported,
   "name.field.class": supported,
   "name.field.interface": supported,
+  "name.field.enum": supported,
   "name.foreach": supported,
   "name.method": supported,
   "name.variable": supported,
   "name.iteration.document": supported,
   "name.iteration.class": supported,
   "name.iteration.interface": supported,
+  "name.iteration.enum": supported,
   "name.iteration.block": supported,
   "name.resource": supported,
 
@@ -168,6 +172,7 @@ export const javaScopeSupport: LanguageScopeSupportFacetMap = {
 
   "interior.class": supported,
   "interior.interface": supported,
+  "interior.enum": supported,
   "interior.constructor": supported,
   "interior.method": supported,
   "interior.if": supported,
@@ -279,6 +284,10 @@ export const javaScopeSupport: LanguageScopeSupportFacetMap = {
   "branch.loop": notApplicable,
   "branch.loop.iteration": notApplicable,
 
+  // Values in enum
+  "value.field.enum": notApplicable,
+  "value.iteration.enum": notApplicable,
+
   // Miscellaneous
   "value.yield": notApplicable,
   pairDelimiter: notApplicable,

queries/java.scm

@@ -43,7 +43,20 @@
 
 ;;!! enum Foo {}
 ;;!  ^^^^^^^^^^^
-(enum_declaration) @type
+;;!       ^^^
+(enum_declaration
+  name: (_) @name
+  body: (_
+    "{" @interior.start.endOf @name.iteration.start.endOf
+    "}" @interior.end.startOf @name.iteration.end.startOf
+  )
+) @type @name.domain @interior.domain
+
+;;!! enum Foo { bar, baz }
+;;!             ^^^  ^^^
+(enum_constant
+  name: (_) @name
+) @_.domain
 
 ;;!! class Foo {}
 ;;!  ^^^^^^^^^^^^