Scope support

Author: AndreasArvidsson

packages/common/src/scopeSupportFacets/csharp.ts

@@ -68,11 +68,11 @@ export const csharpScopeSupport: LanguageScopeSupportFacetMap = {
   "name.field": supported,
   "name.foreach": supported,
   "name.function": supported,
+  "name.method": supported,
+  "name.variable": supported,
   "name.iteration.block": supported,
   "name.iteration.class": supported,
   "name.iteration.document": supported,
-  "name.method": supported,
-  "name.variable": supported,
 
   "value.argument.formal.constructor": supported,
   "value.argument.formal.constructor.iteration": supported,
@@ -103,13 +103,15 @@ export const csharpScopeSupport: LanguageScopeSupportFacetMap = {
   "type.class": supported,
   "type.foreach": supported,
   "type.field": supported,
-  "type.field.iteration": supported,
   "type.interface": supported,
   "type.enum": supported,
   "type.return": supported,
   "type.variable": supported,
   "type.typeArgument": supported,
   "type.typeArgument.iteration": supported,
+  "type.iteration.block": supported,
+  "type.iteration.class": supported,
+  "type.iteration.document": supported,
 
   "key.mapPair": supported,
   "key.mapPair.iteration": supported,
@@ -156,6 +158,7 @@ export const csharpScopeSupport: LanguageScopeSupportFacetMap = {
   statement: supported,
   "statement.class": supported,
   "statement.iteration.block": supported,
+  "statement.iteration.class": supported,
   "statement.iteration.document": supported,
 
   "string.singleLine": supported,

packages/common/src/scopeSupportFacets/java.ts

@@ -85,6 +85,21 @@ export const javaScopeSupport: LanguageScopeSupportFacetMap = {
   "functionName.method": supported,
   "functionName.method.iteration.class": supported,
 
+  ifStatement: supported,
+  statement: supported,
+  "statement.class": supported,
+  "statement.iteration.block": supported,
+  "statement.iteration.class": supported,
+  "statement.iteration.document": supported,
+
+  "string.singleLine": supported,
+  "string.multiLine": supported,
+
+  "textFragment.comment.block": supported,
+  "textFragment.comment.line": supported,
+  "textFragment.string.singleLine": supported,
+  "textFragment.string.multiLine": supported,
+
   "name.argument.formal.constructor": supported,
   "name.argument.formal.constructor.iteration": supported,
   "name.argument.formal.method": supported,
@@ -101,27 +116,23 @@ export const javaScopeSupport: LanguageScopeSupportFacetMap = {
   "name.iteration.block": supported,
   "name.resource": supported,
 
-  ifStatement: supported,
-  statement: supported,
-  "statement.class": supported,
-  "statement.iteration.block": supported,
-  "statement.iteration.document": supported,
-
-  "string.singleLine": supported,
-  "string.multiLine": supported,
-
-  "textFragment.comment.block": supported,
-  "textFragment.comment.line": supported,
-  "textFragment.string.singleLine": supported,
-  "textFragment.string.multiLine": supported,
+  "value.assignment": supported,
+  "value.foreach": supported,
+  "value.field": supported,
+  "value.return": supported,
+  "value.return.lambda": supported,
+  "value.variable": supported,
+  "value.resource": supported,
+  "value.iteration.block": supported,
+  "value.iteration.class": supported,
+  "value.iteration.document": supported,
 
   "type.argument.formal.constructor": supported,
   "type.argument.formal.method": supported,
   "type.argument.formal.constructor.iteration": supported,
   "type.argument.formal.method.iteration": supported,
   "type.foreach": supported,
   "type.field": supported,
-  "type.field.iteration": supported,
   "type.return": supported,
   "type.variable": supported,
   "type.typeArgument": supported,
@@ -131,17 +142,9 @@ export const javaScopeSupport: LanguageScopeSupportFacetMap = {
   "type.class": supported,
   "type.enum": supported,
   "type.interface": supported,
-
-  "value.assignment": supported,
-  "value.foreach": supported,
-  "value.field": supported,
-  "value.return": supported,
-  "value.return.lambda": supported,
-  "value.variable": supported,
-  "value.resource": supported,
-  "value.iteration.block": supported,
-  "value.iteration.class": supported,
-  "value.iteration.document": supported,
+  "type.iteration.block": supported,
+  "type.iteration.class": supported,
+  "type.iteration.document": supported,
 
   "interior.class": supported,
   "interior.constructor": supported,

packages/common/src/scopeSupportFacets/javascript.ts

@@ -23,9 +23,10 @@ export const javascriptCoreScopeSupport: LanguageScopeSupportFacetMap = {
   ifStatement: supported,
 
   statement: supported,
+  "statement.class": supported,
   "statement.iteration.document": supported,
+  "statement.iteration.class": supported,
   "statement.iteration.block": supported,
-  "statement.class": supported,
 
   class: supported,
   "class.iteration.document": supported,
@@ -256,14 +257,16 @@ export const javascriptScopeSupport: LanguageScopeSupportFacetMap = {
   "type.alias": notApplicable,
   "type.cast": notApplicable,
   "type.field": notApplicable,
-  "type.field.iteration": notApplicable,
   "type.foreach": notApplicable,
   "type.interface": notApplicable,
   "type.enum": notApplicable,
   "type.return": notApplicable,
   "type.variable": notApplicable,
   "type.typeArgument": notApplicable,
   "type.typeArgument.iteration": notApplicable,
+  "type.iteration.block": notApplicable,
+  "type.iteration.class": notApplicable,
+  "type.iteration.document": notApplicable,
 
   "value.typeAlias": notApplicable,
 };

packages/common/src/scopeSupportFacets/python.ts

@@ -60,11 +60,13 @@ export const pythonScopeSupport: LanguageScopeSupportFacetMap = {
   "type.argument.formal": supported,
   "type.class": supported,
   "type.field": supported,
-  "type.field.iteration": supported,
   "type.return": supported,
   "type.typeArgument": supported,
   "type.typeArgument.iteration": supported,
   "type.variable": supported,
+  "type.iteration.block": supported,
+  "type.iteration.class": supported,
+  "type.iteration.document": supported,
 
   anonymousFunction: supported,
   namedFunction: supported,
@@ -176,6 +178,7 @@ export const pythonScopeSupport: LanguageScopeSupportFacetMap = {
   statement: supported,
   "statement.class": supported,
   "statement.iteration.block": supported,
+  "statement.iteration.class": supported,
   "statement.iteration.document": supported,
 
   functionCall: supported,

packages/common/src/scopeSupportFacets/typescript.ts

@@ -16,13 +16,15 @@ export const typescriptScopeSupport: LanguageScopeSupportFacetMap = {
   "type.alias": supported,
   "type.cast": supported,
   "type.field": supported,
-  "type.field.iteration": supported,
   "type.interface": supported,
   "type.enum": supported,
   "type.return": supported,
   "type.variable": supported,
   "type.typeArgument": supported,
   "type.typeArgument.iteration": supported,
+  "type.iteration.block": supported,
+  "type.iteration.class": supported,
+  "type.iteration.document": supported,
 
   "value.typeAlias": supported,