Fix/csharp cucumber expression support

src/language/csharpLanguage.ts

@@ -7,7 +7,7 @@ export const csharpLanguage: Language = {
   defineParameterTypeQueries: [],
   defineStepDefinitionQueries: [
     `
-(method_declaration 
+(method_declaration
   (attribute_list
     (attribute
       name: (identifier) @annotation-name
@@ -20,16 +20,38 @@ export const csharpLanguage: Language = {
   )
   (#match? @annotation-name "Given|When|Then|And|But|StepDefinition")
 ) @root
+`,
+    `
+(method_declaration
+  (attribute_list
+    (attribute
+      name: (identifier) @annotation-name
+      (attribute_argument_list
+        (attribute_argument
+          (string_literal) @expression
+        )
+      )
+    )
+  )
+  (#match? @annotation-name "Given|When|Then|And|But|StepDefinition")
+) @root
 `,
   ],
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   convertParameterTypeExpression(s) {
     throw new Error('Unsupported operation')
   },
   convertStepDefinitionExpression(s) {
-    const match = s.match(/^([@$'"]+)(.*)"$/)
-    if (!match) throw new Error(`Could not match ${s}`)
-    return new RegExp(match[2])
+    const regexParamMatch = s.match(/(\([^)]+[*+]\)|\.\*)/)
+    const regexExpressionMatch = s.match(/^@"(\^.*\$)"$/)
+
+    if (regexExpressionMatch || regexParamMatch) {
+      // For regex step definitions, the string always needs to be verbatim_string_literal (i.e. Prefixed with an '@')
+      return new RegExp(s.substring(2, s.length - 1))
+    }
+
+    const exprStart = s.startsWith('@') ? 2 : 1
+    return s.substring(exprStart, s.length - 1)
   },
 
   snippetParameters: {

test/language/ExpressionBuilder.test.ts

@@ -9,7 +9,7 @@ import { ParserAdapter, Source } from '../../src/language/types.js'
 import { NodeParserAdapter } from '../../src/tree-sitter-node/NodeParserAdapter.js'
 import { WasmParserAdapter } from '../../src/tree-sitter-wasm/WasmParserAdapter.js'
 
-const parameterTypeSupport: Set<LanguageName> = new Set(['typescript', 'java', 'ruby'])
+const parameterTypeSupport: Set<LanguageName> = new Set(['typescript', 'java', 'ruby', 'c_sharp'])
 
 function defineContract(makeParserAdapter: () => ParserAdapter) {
   let expressionBuilder: ExpressionBuilder

test/language/testdata/c_sharp/StepDefinitions.cs

@@ -2,11 +2,27 @@
 
 namespace StepDefinitions
 {
-    [Binding]
-    public class BowlingSteps
-    {
-        [Given(@"^a regexp$")]
-        public void a_regexp() {
-        }
-    }
+	[Binding]
+	public class BowlingSteps
+	{
+		[Given(@"^a regexp$")]
+		public void ARegexp() 
+		{
+		}
+
+		[When("a {uuid}")]
+		public void AUniqueID(string uuid) 
+		{
+		}
+
+		[Then("a {date}")]
+		public void ADate(Date date) 
+		{
+		}
+
+		[Then("an {undefined-parameter}")]
+		public void AnUndefinedParameter(Date date) 
+		{
+		}
+	}
 }