Add resources

Author: AndreasArvidsson

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

@@ -0,0 +1,24 @@
+try (PrintWriter writer = create()) { }
+---
+
+[Content] = 0:17-0:23
+                   >------<
+0| try (PrintWriter writer = create()) { }
+
+[Removal] = 0:17-0:24
+                   >-------<
+0| try (PrintWriter writer = create()) { }
+
+[Leading delimiter] = 0:16-0:17
+                  >-<
+0| try (PrintWriter writer = create()) { }
+
+[Trailing delimiter] = 0:23-0:24
+                         >-<
+0| try (PrintWriter writer = create()) { }
+
+[Domain] = 0:0-0:39
+  >---------------------------------------<
+0| try (PrintWriter writer = create()) { }
+
+[Insertion delimiter] = " "

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

@@ -0,0 +1,20 @@
+try (PrintWriter writer = create()) { }
+---
+
+[Content] = 0:5-0:16
+       >-----------<
+0| try (PrintWriter writer = create()) { }
+
+[Removal] = 0:5-0:17
+       >------------<
+0| try (PrintWriter writer = create()) { }
+
+[Trailing delimiter] = 0:16-0:17
+                  >-<
+0| try (PrintWriter writer = create()) { }
+
+[Domain] = 0:0-0:39
+  >---------------------------------------<
+0| try (PrintWriter writer = create()) { }
+
+[Insertion delimiter] = " "

data/fixtures/scopes/java/value.resource.scope

@@ -0,0 +1,20 @@
+try (PrintWriter writer = create()) { }
+---
+
+[Content] = 0:26-0:34
+                            >--------<
+0| try (PrintWriter writer = create()) { }
+
+[Removal] = 0:25-0:34
+                           >---------<
+0| try (PrintWriter writer = create()) { }
+
+[Leading delimiter] = 0:25-0:26
+                           >-<
+0| try (PrintWriter writer = create()) { }
+
+[Domain] = 0:0-0:39
+  >---------------------------------------<
+0| try (PrintWriter writer = create()) { }
+
+[Insertion delimiter] = " "

packages/common/src/scopeSupportFacets/java.ts

@@ -80,6 +80,7 @@ export const javaScopeSupport: LanguageScopeSupportFacetMap = {
   "name.variable": supported,
   "name.iteration.document": supported,
   "name.iteration.block": supported,
+  "name.resource": supported,
 
   ifStatement: supported,
   statement: supported,
@@ -91,39 +92,34 @@ export const javaScopeSupport: LanguageScopeSupportFacetMap = {
   "textFragment.comment.line": supported,
   "textFragment.string.singleLine": supported,
 
-  "type.typeArgument": supported,
-  "type.typeArgument.iteration": supported,
-
   "type.argument.formal.constructor": supported,
   "type.argument.formal.method": supported,
   "type.foreach": supported,
   "type.field": supported,
   "type.field.iteration": supported,
   "type.return": supported,
   "type.variable": supported,
+  "type.typeArgument": supported,
+  "type.typeArgument.iteration": supported,
+  "type.resource": supported,
 
   "value.assignment": supported,
   "value.foreach": supported,
   "value.field": supported,
   "value.return": supported,
   "value.return.lambda": supported,
   "value.variable": supported,
+  "value.resource": supported,
 
   // Unsupported
 
-  "name.resource": unsupported,
-  "name.resource.iteration": unsupported,
-
   "type.argument.formal.constructor.iteration": unsupported,
   "type.argument.formal.method.iteration": unsupported,
   "type.cast": unsupported,
   "type.class": unsupported,
   "type.enum": unsupported,
   "type.interface": unsupported,
 
-  "value.resource": unsupported,
-  "value.resource.iteration": unsupported,
-
   "interior.class": unsupported,
   "interior.element": unsupported,
   "interior.function": unsupported,
@@ -151,6 +147,7 @@ export const javaScopeSupport: LanguageScopeSupportFacetMap = {
   "name.argument.formal.iteration": notApplicable,
   "name.function": notApplicable,
   "name.variable.pattern": notApplicable,
+  "name.resource.iteration": notApplicable,
 
   "key.mapPair": notApplicable,
   "key.mapPair.iteration": notApplicable,
@@ -169,10 +166,12 @@ export const javaScopeSupport: LanguageScopeSupportFacetMap = {
   "value.variable.pattern": notApplicable,
   "value.typeAlias": notApplicable,
   "value.yield": notApplicable,
+  "value.resource.iteration": notApplicable,
 
   "type.argument.formal": notApplicable,
   "type.argument.formal.iteration": notApplicable,
   "type.alias": notApplicable,
+  "type.resource.iteration": notApplicable,
 
   section: notApplicable,
   "section.iteration.document": notApplicable,

packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts

@@ -706,6 +706,16 @@ export const scopeSupportFacetInfos: Record<
     scopeType: "type",
     isIteration: true,
   },
+  "type.resource": {
+    description: "Type in a 'with' / 'use' / 'using' statement",
+    scopeType: "type",
+  },
+  "type.resource.iteration": {
+    description:
+      "Iteration scope for types in a 'with' / 'use' / 'using' statement",
+    scopeType: "type",
+    isIteration: true,
+  },
 
   "interior.element": {
     description: "The interior/children of an XML element",

packages/common/src/scopeSupportFacets/scopeSupportFacets.types.ts

@@ -173,6 +173,8 @@ export const scopeSupportFacets = [
   "type.class",
   "type.typeArgument",
   "type.typeArgument.iteration",
+  "type.resource",
+  "type.resource.iteration",
 
   "interior.class",
   "interior.function",

queries/java.scm

@@ -500,6 +500,18 @@
   ")" @argumentOrParameter.iteration.end.startOf
 ) @argumentOrParameter.iteration.domain
 
+;;!! try (PrintWriter writer = create()) { }
+;;!       ^^^^^^^^^^^ ^^^^^    ^^^^^^^^
+(try_with_resources_statement
+  (resource_specification
+    (resource
+      type: (_) @type
+      name: (_) @name
+      value: (_) @value
+    )
+  )
+) @_.domain
+
 operator: [
   "<"
   "<<"