More csharp

Author: AndreasArvidsson

packages/common/src/scopeSupportFacets/html.ts

@@ -124,6 +124,7 @@ export const htmlScopeSupport: LanguageScopeSupportFacetMap = {
   "name.foreach": notApplicable,
   "name.function": notApplicable,
   "name.iteration.block": notApplicable,
+  "name.iteration.class": notApplicable,
   "name.iteration.document": notApplicable,
   "name.method": notApplicable,
   "name.resource.iteration": notApplicable,
@@ -185,6 +186,9 @@ export const htmlScopeSupport: LanguageScopeSupportFacetMap = {
   "value.variable.pattern": notApplicable,
   "value.variable": notApplicable,
   "value.yield": notApplicable,
+  "value.iteration.block": notApplicable,
+  "value.iteration.class": notApplicable,
+  "value.iteration.document": notApplicable,
   anonymousFunction: notApplicable,
   class: notApplicable,
   className: notApplicable,

packages/common/src/scopeSupportFacets/markdown.ts

@@ -139,6 +139,7 @@ export const markdownScopeSupport: LanguageScopeSupportFacetMap = {
   "name.foreach": notApplicable,
   "name.function": notApplicable,
   "name.iteration.block": notApplicable,
+  "name.iteration.class": notApplicable,
   "name.iteration.document": notApplicable,
   "name.method": notApplicable,
   "name.resource": notApplicable,
@@ -208,6 +209,9 @@ export const markdownScopeSupport: LanguageScopeSupportFacetMap = {
   "value.variable": notApplicable,
   "value.variable.pattern": notApplicable,
   "value.yield": notApplicable,
+  "value.iteration.block": notApplicable,
+  "value.iteration.class": notApplicable,
+  "value.iteration.document": notApplicable,
   selector: notApplicable,
   unit: notApplicable,
 };

packages/common/src/scopeSupportFacets/scm.ts

@@ -139,6 +139,7 @@ export const scmScopeSupport: LanguageScopeSupportFacetMap = {
   "name.foreach": notApplicable,
   "name.function": notApplicable,
   "name.iteration.block": notApplicable,
+  "name.iteration.class": notApplicable,
   "name.iteration.document": notApplicable,
   "name.method": notApplicable,
   "name.resource": notApplicable,
@@ -209,6 +210,9 @@ export const scmScopeSupport: LanguageScopeSupportFacetMap = {
   "value.variable": notApplicable,
   "value.variable.pattern": notApplicable,
   "value.yield": notApplicable,
+  "value.iteration.block": notApplicable,
+  "value.iteration.class": notApplicable,
+  "value.iteration.document": notApplicable,
   selector: notApplicable,
   unit: notApplicable,
 };

packages/common/src/scopeSupportFacets/xml.ts

@@ -138,6 +138,7 @@ export const xmlScopeSupport: LanguageScopeSupportFacetMap = {
   "name.foreach": notApplicable,
   "name.function": notApplicable,
   "name.iteration.block": notApplicable,
+  "name.iteration.class": notApplicable,
   "name.iteration.document": notApplicable,
   "name.method": notApplicable,
   "name.resource": notApplicable,
@@ -205,6 +206,9 @@ export const xmlScopeSupport: LanguageScopeSupportFacetMap = {
   "value.variable": notApplicable,
   "value.variable.pattern": notApplicable,
   "value.yield": notApplicable,
+  "value.iteration.block": notApplicable,
+  "value.iteration.class": notApplicable,
+  "value.iteration.document": notApplicable,
   selector: notApplicable,
   unit: notApplicable,
 };

packages/common/src/scopeSupportFacets/yaml.ts

@@ -145,6 +145,7 @@ export const yamlScopeSupport: LanguageScopeSupportFacetMap = {
   "name.foreach": notApplicable,
   "name.function": notApplicable,
   "name.iteration.block": notApplicable,
+  "name.iteration.class": notApplicable,
   "name.iteration.document": notApplicable,
   "name.method": notApplicable,
   "name.resource": notApplicable,
@@ -212,6 +213,9 @@ export const yamlScopeSupport: LanguageScopeSupportFacetMap = {
   "value.variable": notApplicable,
   "value.variable.pattern": notApplicable,
   "value.yield": notApplicable,
+  "value.iteration.block": notApplicable,
+  "value.iteration.class": notApplicable,
+  "value.iteration.document": notApplicable,
   selector: notApplicable,
   unit: notApplicable,
 };

queries/csharp.scm

@@ -77,13 +77,12 @@
 
 (
   (_
-    (_
+    (block
       "{" @interior.start.endOf
       "}" @interior.end.startOf
-    ) @_dummy
+    )
   ) @_.domain
-  (#type? @_dummy block switch_body)
-  (#not-type? @_.domain try_statement)
+  (#not-type? @_.domain try_statement if_statement)
 )
 
 ;;!! if () {}
@@ -299,6 +298,15 @@
   )
 ] @_.domain
 
+;;!! switch(value) { }
+;;!                 ^
+(switch_statement
+  (switch_body
+    "{" @interior.start.endOf
+    "}" @interior.end.startOf
+  )
+) @_.domain
+
 (switch_statement
   (tuple_expression) @private.switchStatementSubject
 ) @_.domain