Started working on csharp interior scopes

AndreasArvidsson · AndreasArvidsson · commit 35cbef9cc4d8 · 2025-06-26T13:03:18.000+02:00
diff --git a/data/fixtures/scopes/csharp/interior.class.scope b/data/fixtures/scopes/csharp/interior.class.scope
@@ -0,0 +1,2 @@
+class Foo { }
+---
diff --git a/data/fixtures/scopes/csharp/interior.function.scope b/data/fixtures/scopes/csharp/interior.function.scope
@@ -0,0 +1,2 @@
+void Foo() { }
+---
diff --git a/data/fixtures/scopes/csharp/interior.if.scope b/data/fixtures/scopes/csharp/interior.if.scope
@@ -0,0 +1,4 @@
+if (true) { }
+else if (false) { }
+else { }
+---
diff --git a/data/fixtures/scopes/csharp/interior.lambda.scope b/data/fixtures/scopes/csharp/interior.lambda.scope
@@ -0,0 +1,2 @@
+() => 0;
+---
diff --git a/data/fixtures/scopes/csharp/interior.lambda2.scope b/data/fixtures/scopes/csharp/interior.lambda2.scope
@@ -0,0 +1,2 @@
+() => { };
+---
diff --git a/data/fixtures/scopes/csharp/interior.loop.scope b/data/fixtures/scopes/csharp/interior.loop.scope
@@ -0,0 +1,2 @@
+while (true) { }
+---
diff --git a/data/fixtures/scopes/csharp/interior.loop2.scope b/data/fixtures/scopes/csharp/interior.loop2.scope
@@ -0,0 +1,2 @@
+do { } while (true);
+---
diff --git a/data/fixtures/scopes/csharp/interior.loop3.scope b/data/fixtures/scopes/csharp/interior.loop3.scope
@@ -0,0 +1,2 @@
+for (int i = 0; i < size; ++i) { }
+---
diff --git a/data/fixtures/scopes/csharp/interior.loop4.scope b/data/fixtures/scopes/csharp/interior.loop4.scope
@@ -0,0 +1,2 @@
+foreach (int v in values) { }
+---
diff --git a/data/fixtures/scopes/csharp/interior.switchCase.scope b/data/fixtures/scopes/csharp/interior.switchCase.scope
@@ -0,0 +1,11 @@
+switch (aaa) {
+    case 0:
+        foo;
+        break;
+    case 1: {
+        break;
+    }
+    default:
+        break;
+}
+---
diff --git a/data/fixtures/scopes/csharp/interior.ternary.scope b/data/fixtures/scopes/csharp/interior.ternary.scope
@@ -0,0 +1,2 @@
+true ? 1 : 0;
+---
diff --git a/data/fixtures/scopes/csharp/interior.try.scope b/data/fixtures/scopes/csharp/interior.try.scope
@@ -0,0 +1,3 @@
+try { }
+catch(final Exception ex) { }
+---
diff --git a/packages/common/src/scopeSupportFacets/csharp.ts b/packages/common/src/scopeSupportFacets/csharp.ts
@@ -1,7 +1,7 @@
 import type { LanguageScopeSupportFacetMap } from "./scopeSupportFacets.types";
 import { ScopeSupportFacetLevel } from "./scopeSupportFacets.types";
 
-const { supported, unsupported, notApplicable } = ScopeSupportFacetLevel;
+const { supported, notApplicable } = ScopeSupportFacetLevel;
 
 export const csharpScopeSupport: LanguageScopeSupportFacetMap = {
   switchStatementSubject: supported,
@@ -160,16 +160,14 @@ export const csharpScopeSupport: LanguageScopeSupportFacetMap = {
   "textFragment.comment.line": supported,
   "textFragment.comment.block": supported,
 
-  // Unsupported
-
-  "interior.class": unsupported,
-  "interior.function": unsupported,
-  "interior.if": unsupported,
-  "interior.lambda": unsupported,
-  "interior.loop": unsupported,
-  "interior.switchCase": unsupported,
-  "interior.ternary": unsupported,
-  "interior.try": unsupported,
+  "interior.class": supported,
+  "interior.function": supported,
+  "interior.if": supported,
+  "interior.lambda": supported,
+  "interior.loop": supported,
+  "interior.switchCase": supported,
+  "interior.ternary": supported,
+  "interior.try": supported,
 
   // Not applicable
 
diff --git a/queries/csharp.scm b/queries/csharp.scm
@@ -144,6 +144,10 @@
 ;;!  ^^^^^^^^^^^^
 (class_declaration
   name: (identifier) @className
+  body: (_
+    "{" @interior.start.endOf
+    "}" @interior.end.startOf
+  )
 ) @class @type @_.domain
 
 (
@@ -156,12 +160,10 @@
 ;;!                             ***
 (_
   body: (_
-    .
-    "{" @class.iteration.start.endOf @className.iteration.start.endOf
-    "}" @class.iteration.end.startOf @className.iteration.end.startOf
-    .
+    "{" @class.iteration.start.endOf @className.iteration.start.endOf @interior.start.endOf
+    "}" @class.iteration.end.startOf @className.iteration.end.startOf @interior.end.startOf
   )
-)
+) @interior.domain
 
 ;;!! "Hello world"
 (

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+for (int i = 0; i < size; ++i) { }`
	`2`	`+---`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+foreach (int v in values) { }`
	`2`	`+---`