Fix: Find godog step definitions within method_declaration (#215)

* add support for golang methods * update changelog * test godog definition within method_declaration --------- Co-authored-by: Kieran Ryan <kierankilkenny@gmail.com>
cucumber · Jul 4, 2024 · 0d28333 · 0d28333
1 parent c7cdd0a
commit 0d28333
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - (Ruby) Support `And` and `But` step definition annotations ([#211](https://github.com/cucumber/language-service/pull/211))
 - (Python) Title variants of Behave's decorators (`Step`, `Given`, `When`, `Then`) ([#213](https://github.com/cucumber/language-service/pull/213))
 - (PHP) Scoped query to match annotations only (`@Given`) ([#214](https://github.com/cucumber/language-service/pull/214))
+- (Go) Find godog step definitions within `method_declaration` ([#215](https://github.com/cucumber/language-service/pull/215))
 
 ## [1.6.0] - 2024-05-12
 ### Added

diff --git a/src/language/goLanguage.ts b/src/language/goLanguage.ts
@@ -42,6 +42,34 @@ export const goLanguage: Language = {
             )
             (#match? @annotation-name "Given|When|Then|Step")))))@root
     `,
+    `(method_declaration
+      body: (block
+        (expression_statement
+          (call_expression
+            function: (selector_expression
+              field: (field_identifier) @annotation-name
+            )
+            arguments: (argument_list
+              [
+                (raw_string_literal) @expression
+              ]
+            )
+            (#match? @annotation-name "Given|When|Then|Step")))))@root
+    `,
+    `(method_declaration
+      body: (block
+        (expression_statement
+          (call_expression
+            function: (selector_expression
+              field: (field_identifier) @annotation-name
+            )
+            arguments: (argument_list
+              [
+                (interpreted_string_literal) @expression
+              ]
+            )
+            (#match? @annotation-name "Given|When|Then|Step")))))@root
+    `,
   ],
   snippetParameters: {
     int: { type: 'int', name: 'i' },

diff --git a/test/language/ExpressionBuilder.test.ts b/test/language/ExpressionBuilder.test.ts
@@ -109,7 +109,7 @@ Please register a ParameterType for 'undefined-parameter'`,
         }
         assert(matched, 'The generated expressions did not match parameter type {date}')
       } else {
-        assert.deepStrictEqual(expressions, [/^a regexp$/])
+        assert.deepStrictEqual(expressions, [/^a regexp$/, /^I test this change$/])
         assert.deepStrictEqual(errors, ['There is already a parameter type with name int'])
       }
     })

diff --git a/test/language/testdata/go/StepDefinitions.go b/test/language/testdata/go/StepDefinitions.go
@@ -9,3 +9,7 @@ func a_regexp() {}
 func InitializeScenario(ctx *godog.ScenarioContext) {
 	ctx.Given(`^a regexp$`, a_regexp)
 }
+
+func (s suite) Steps(sc *godog.ScenarioContext) {
+    sc.Given(`^I test this change$`, a_regexp)
+}
diff --git a/test/language/testdata/php/StepDefinitions.php b/test/language/testdata/php/StepDefinitions.php
@@ -11,5 +11,12 @@ public function regexp()
     {
         // Given
     }
-}
 
+    /**
+     * @Given ^I test this change$
+     */
+    public function test_changes()
+    {
+        // Given
+    }
+}