Adding more csharp scopes

AndreasArvidsson · AndreasArvidsson · commit 136f8c617b67 · 2025-05-31T06:45:53.000+02:00
diff --git a/data/fixtures/scopes/csharp/argument.formal.lambda.iteration.scope b/data/fixtures/scopes/csharp/argument.formal.lambda.iteration.scope
@@ -0,0 +1,10 @@
+(a, b) => {}
+---
+
+[Range] = 0:1-0:5
+   >----<
+0| (a, b) => {}
+
+[Domain] = 0:0-0:12
+  >------------<
+0| (a, b) => {}
diff --git a/data/fixtures/scopes/csharp/argument.formal.lambda.scope b/data/fixtures/scopes/csharp/argument.formal.lambda.scope
@@ -0,0 +1,33 @@
+(a, b) => {}
+---
+
+[#1 Content] =
+[#1 Domain] = 0:1-0:2
+   >-<
+0| (a, b) => {}
+
+[#1 Removal] = 0:1-0:4
+   >---<
+0| (a, b) => {}
+
+[#1 Trailing delimiter] = 0:2-0:4
+    >--<
+0| (a, b) => {}
+
+[#1 Insertion delimiter] = ", "
+
+
+[#2 Content] =
+[#2 Domain] = 0:4-0:5
+      >-<
+0| (a, b) => {}
+
+[#2 Removal] = 0:2-0:5
+    >---<
+0| (a, b) => {}
+
+[#2 Leading delimiter] = 0:2-0:4
+    >--<
+0| (a, b) => {}
+
+[#2 Insertion delimiter] = ", "
diff --git a/data/fixtures/scopes/csharp/comment.block.scope b/data/fixtures/scopes/csharp/comment.block.scope
@@ -0,0 +1,17 @@
+/* 
+    Hello
+    world
+*/
+---
+
+[Content] =
+[Removal] =
+[Domain] = 0:0-3:2
+  >---
+0| /* 
+1|     Hello
+2|     world
+3| */
+   --<
+
+[Insertion delimiter] = "\n"
diff --git a/data/fixtures/scopes/csharp/comment.line.scope b/data/fixtures/scopes/csharp/comment.line.scope
@@ -0,0 +1,10 @@
+// Hello world
+---
+
+[Content] =
+[Removal] =
+[Domain] = 0:0-0:14
+  >--------------<
+0| // Hello world
+
+[Insertion delimiter] = "\n"
diff --git a/data/fixtures/scopes/csharp/statement.class.scope b/data/fixtures/scopes/csharp/statement.class.scope
@@ -0,0 +1,10 @@
+class MyClass { }
+---
+
+[Content] =
+[Removal] =
+[Domain] = 0:0-0:17
+  >-----------------<
+0| class MyClass { }
+
+[Insertion delimiter] = "\n"
diff --git a/data/fixtures/scopes/csharp/statement.iteration.block.scope b/data/fixtures/scopes/csharp/statement.iteration.block.scope
@@ -0,0 +1,13 @@
+class MyClass { }
+---
+
+[#1 Range] =
+[#1 Domain] = 0:0-0:17
+  >-----------------<
+0| class MyClass { }
+
+
+[#2 Range] =
+[#2 Domain] = 0:15-0:16
+                 >-<
+0| class MyClass { }
diff --git a/data/fixtures/scopes/csharp/statement.iteration.block2.scope b/data/fixtures/scopes/csharp/statement.iteration.block2.scope
@@ -0,0 +1,13 @@
+void MyFunk() { }
+---
+
+[#1 Range] =
+[#1 Domain] = 0:0-0:17
+  >-----------------<
+0| void MyFunk() { }
+
+
+[#2 Range] =
+[#2 Domain] = 0:15-0:16
+                 >-<
+0| void MyFunk() { }
diff --git a/data/fixtures/scopes/csharp/statement.iteration.document.scope b/data/fixtures/scopes/csharp/statement.iteration.document.scope
@@ -0,0 +1,18 @@
+
+class MyClass {}
+
+---
+
+[#1 Range] =
+[#1 Domain] = 0:0-2:0
+  >
+0|
+1| class MyClass {}
+2|
+   <
+
+
+[#2 Range] =
+[#2 Domain] = 1:15-1:15
+                 ><
+1| class MyClass {}
diff --git a/data/fixtures/scopes/csharp/statement.scope b/data/fixtures/scopes/csharp/statement.scope
@@ -0,0 +1,10 @@
+int value = 2;
+---
+
+[Content] =
+[Removal] =
+[Domain] = 0:0-0:14
+  >--------------<
+0| int value = 2;
+
+[Insertion delimiter] = "\n"
diff --git a/data/fixtures/scopes/csharp/string.multiLine.scope b/data/fixtures/scopes/csharp/string.multiLine.scope
@@ -0,0 +1,13 @@
+@"hello
+world";
+---
+
+[Content] =
+[Removal] =
+[Domain] = 0:0-1:6
+  >-------
+0| @"hello
+1| world";
+   ------<
+
+[Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/csharp/string.singleLine.scope b/data/fixtures/scopes/csharp/string.singleLine.scope
@@ -0,0 +1,10 @@
+"hello world"; 
+---
+
+[Content] =
+[Removal] =
+[Domain] = 0:0-0:13
+  >-------------<
+0| "hello world"; 
+
+[Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/csharp/textFragment.string.multiLine.scope b/data/fixtures/scopes/csharp/textFragment.string.multiLine.scope
@@ -0,0 +1,13 @@
+@"hello
+world";
+---
+
+[Content] =
+[Removal] =
+[Domain] = 0:2-1:5
+    >-----
+0| @"hello
+1| world";
+   -----<
+
+[Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/csharp/textFragment.string.singleLine.scope b/data/fixtures/scopes/csharp/textFragment.string.singleLine.scope
@@ -0,0 +1,10 @@
+"hello world";
+---
+
+[Content] =
+[Removal] =
+[Domain] = 0:1-0:12
+   >-----------<
+0| "hello world";
+
+[Insertion delimiter] = " "
diff --git a/packages/common/src/scopeSupportFacets/csharp.ts b/packages/common/src/scopeSupportFacets/csharp.ts
@@ -4,7 +4,6 @@ import { ScopeSupportFacetLevel } from "./scopeSupportFacets.types";
 const { supported, notApplicable } = ScopeSupportFacetLevel;
 
 export const csharpScopeSupport: LanguageScopeSupportFacetMap = {
-  ifStatement: supported,
   switchStatementSubject: supported,
   anonymousFunction: supported,
   map: supported,
@@ -20,6 +19,9 @@ export const csharpScopeSupport: LanguageScopeSupportFacetMap = {
   "className.iteration.document": supported,
   "className.iteration.block": supported,
 
+  "comment.line": supported,
+  "comment.block": supported,
+
   functionCall: supported,
   "functionCall.constructor": supported,
   functionCallee: supported,
@@ -87,11 +89,24 @@ export const csharpScopeSupport: LanguageScopeSupportFacetMap = {
   "argument.actual.method.iteration": supported,
   "argument.formal": supported,
   "argument.formal.iteration": supported,
+  "argument.formal.lambda": supported,
+  "argument.formal.lambda.iteration": supported,
   "argument.formal.constructor": supported,
   "argument.formal.constructor.iteration": supported,
   "argument.formal.method": supported,
   "argument.formal.method.iteration": supported,
 
+  ifStatement: supported,
+  statement: supported,
+  "statement.class": supported,
+  "statement.iteration.block": supported,
+  "statement.iteration.document": supported,
+
+  "string.singleLine": supported,
+  "string.multiLine": supported,
+  "textFragment.string.singleLine": supported,
+  "textFragment.string.multiLine": supported,
+
   // Not applicable
 
   "interior.element": notApplicable,
@@ -108,4 +123,11 @@ export const csharpScopeSupport: LanguageScopeSupportFacetMap = {
   section: notApplicable,
   startTag: notApplicable,
   tags: notApplicable,
+  "collectionItem.unenclosed": notApplicable,
+  "collectionItem.unenclosed.iteration": notApplicable,
+  "functionName.iteration.document": notApplicable,
+  "functionName.iteration.block": notApplicable,
+  "namedFunction.iteration.document": notApplicable,
+  "namedFunction.iteration.block": notApplicable,
+  pairDelimiter: notApplicable,
 };
diff --git a/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/SurroundingPairScopeHandler/delimiterMaps.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/SurroundingPairScopeHandler/delimiterMaps.ts
@@ -73,6 +73,13 @@ const delimiterToTextOverrides: Record<string, Partial<DelimiterMap>> = {
   ruby: {
     tripleDoubleQuotes: ["%Q(", ")"],
   },
+
+  csharp: {
+    doubleQuotes: [
+      ['@"', '"'],
+      ['"', '"'],
+    ],
+  },
 };
 
 export const leftToRightMap: Record<string, string> = Object.fromEntries(
diff --git a/queries/csharp.scm b/queries/csharp.scm
@@ -50,6 +50,18 @@
 
 (if_statement) @ifStatement
 
+(
+  (compilation_unit) @statement.iteration
+  (#document-range! @statement.iteration)
+)
+
+(_
+  body: (_
+    "{" @statement.iteration.start.endOf
+    "}" @statement.iteration.end.startOf
+  )
+)
+
 ;;!! if () {}
 ;;!  ^^^^^^^^
 (
@@ -147,6 +159,11 @@
   (#child-range! @textFragment 0 -1 true true)
 )
 
+(
+  (verbatim_string_literal) @string @textFragment
+  (#character-range! @textFragment 2 -1)
+)
+
 (comment) @comment @textFragment
 
 (lambda_expression) @anonymousFunction
