Merge branch 'main' into pokey/bump-webpack-next-pnpm

Author: pokey

data/fixtures/scopes/csharp/functionName.method.iteration.class.scope

@@ -0,0 +1,7 @@
+class MyClass { }
+---
+
+[Range] =
+[Domain] = 0:15-0:16
+                 >-<
+0| class MyClass { }

data/fixtures/scopes/csharp/namedFunction.method.iteration.class.scope

@@ -0,0 +1,7 @@
+class MyClass { }
+---
+
+[Range] =
+[Domain] = 0:15-0:16
+                 >-<
+0| class MyClass { }

packages/common/src/scopeSupportFacets/csharp.ts

@@ -28,10 +28,12 @@ export const csharpScopeSupport: LanguageScopeSupportFacetMap = {
   namedFunction: supported,
   "namedFunction.constructor": supported,
   "namedFunction.method": supported,
+  "namedFunction.method.iteration.class": supported,
 
   functionName: supported,
   "functionName.constructor": supported,
   "functionName.method": supported,
+  "functionName.method.iteration.class": supported,
 
   "condition.for": supported,
   "condition.while": supported,

queries/csharp.scm

@@ -53,6 +53,7 @@
 (class_declaration
   name: (identifier) @className
 ) @class @_.domain
+
 (compilation_unit) @class.iteration @className.iteration
 ;; Treat interior of all bodies as iteration scopes for class and classname, eg
 ;;!! private static void foo() {   }
@@ -89,6 +90,13 @@
   )
 ] @namedFunction @functionName.domain
 
+(class_declaration
+  body: (_
+    "{" @namedFunction.iteration.start.endOf @functionName.iteration.start.endOf
+    "}" @namedFunction.iteration.end.startOf @functionName.iteration.end.startOf
+  )
+)
+
 [
   (invocation_expression)
   (object_creation_expression)