csharp migrate classname

cursorless-dev · May 19, 2024 · 3a98ae3 · 3a98ae3
1 parent 2b6475e
commit 3a98ae3
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/data/fixtures/scopes/csharp/className.scope b/data/fixtures/scopes/csharp/className.scope
@@ -0,0 +1,21 @@
+public class BankAccount {}
+---
+
+[Content] =
+[Domain] = 0:13-0:24
+               >-----------<
+0| public class BankAccount {}
+
+[Removal] = 0:13-0:25
+               >------------<
+0| public class BankAccount {}
+
+[Leading delimiter] = 0:12-0:13
+              >-<
+0| public class BankAccount {}
+
+[Trailing delimiter] = 0:24-0:25
+                          >-<
+0| public class BankAccount {}
+
+[Insertion delimiter] = " "
diff --git a/packages/common/src/scopeSupportFacets/csharp.ts b/packages/common/src/scopeSupportFacets/csharp.ts
@@ -11,4 +11,5 @@ const { supported, unsupported, notApplicable } = ScopeSupportFacetLevel;
 export const csharpScopeSupport: LanguageScopeSupportFacetMap = {
   ifStatement: supported,
   class: supported,
+  className: supported,
 };
diff --git a/packages/cursorless-engine/src/languages/csharp.ts b/packages/cursorless-engine/src/languages/csharp.ts
@@ -139,7 +139,6 @@ const nodeMatchers: Partial<
   Record<SimpleScopeTypeType, NodeMatcherAlternative>
 > = {
   ...getMapMatchers,
-  className: "class_declaration[name]",
   condition: cascadingMatcher(
     conditionMatcher("*[condition]"),
     patternMatcher("while_statement[0]"),

diff --git a/queries/csharp.scm b/queries/csharp.scm
@@ -1,5 +1,6 @@
 (if_statement) @ifStatement
-(class_declaration) @class
+(class_declaration
+name: (identifier) @className) @class
 (
   (string_literal) @string @textFragment
   (#child-range! @textFragment 0 -1 true true)