Fix @method parsing

Author: AJenbo

src/definition/resolve.rs

@@ -1133,7 +1133,15 @@ impl Backend {
             // The method name is followed by `(` in a @method tag.
             let method_pattern = member_name;
             for (line_idx, line) in content.lines().enumerate() {
-                if let Some(col) = line.find(method_pattern) {
+                // Search for ALL occurrences of the pattern within the line,
+                // not just the first one.  This is important when the method
+                // name collides with a type keyword (e.g. `string`) that also
+                // appears as the return type on the same line.
+                let mut search_start = 0;
+                while let Some(offset) = line[search_start..].find(method_pattern) {
+                    let col = search_start + offset;
+                    search_start = col + method_pattern.len();
+
                     // Verify the character after the name is `(` (method call syntax).
                     let after_pos = col + method_pattern.len();
                     if after_pos >= line.len() {

src/docblock.rs

@@ -1043,6 +1043,22 @@ mod tests {
         assert!(!methods[0].parameters[0].is_required);
     }
 
+    #[test]
+    fn method_tag_name_matches_type_keyword() {
+        let doc = "/** @method static string string(string $key, \\Closure|string|null $default = null) */";
+        let methods = extract_method_tags(doc);
+        assert_eq!(methods.len(), 1);
+        assert_eq!(methods[0].name, "string");
+        assert_eq!(methods[0].return_type.as_deref(), Some("string"));
+        assert!(methods[0].is_static);
+        assert_eq!(methods[0].parameters.len(), 2);
+        assert_eq!(methods[0].parameters[0].name, "$key");
+        assert_eq!(
+            methods[0].parameters[0].type_hint.as_deref(),
+            Some("string")
+        );
+    }
+
     // ─── @property tag extraction ───────────────────────────────────────
 
     #[test]

tests/definition_members.rs

@@ -1304,3 +1304,62 @@ async fn test_goto_definition_this_property_vs_method_disambiguation() {
         other => panic!("Expected Scalar location, got: {:?}", other),
     }
 }
+
+// ── @method tag: method name matches a type keyword ─────────────────────────
+
+#[tokio::test]
+async fn test_goto_definition_method_tag_name_matches_type_keyword() {
+    let backend = create_test_backend();
+
+    let uri = Url::parse("file:///method_string.php").unwrap();
+    let text = concat!(
+        "<?php\n", // 0
+        "/**\n",   // 1
+        " * @method static string string(string $key, \\Closure|string|null $default = null)\n", // 2
+        " */\n",                      // 3
+        "class Config {\n",           // 4
+        "}\n",                        // 5
+        "\n",                         // 6
+        "Config::string('hello');\n", // 7
+    );
+
+    let open_params = DidOpenTextDocumentParams {
+        text_document: TextDocumentItem {
+            uri: uri.clone(),
+            language_id: "php".to_string(),
+            version: 1,
+            text: text.to_string(),
+        },
+    };
+    backend.did_open(open_params).await;
+
+    // Click on "string" in `Config::string('hello')` on line 7, character 8
+    let params = GotoDefinitionParams {
+        text_document_position_params: TextDocumentPositionParams {
+            text_document: TextDocumentIdentifier { uri: uri.clone() },
+            position: Position {
+                line: 7,
+                character: 10,
+            },
+        },
+        work_done_progress_params: WorkDoneProgressParams::default(),
+        partial_result_params: PartialResultParams::default(),
+    };
+
+    let result = backend.goto_definition(params).await.unwrap();
+    assert!(
+        result.is_some(),
+        "Should resolve Config::string() to the @method tag declaration"
+    );
+
+    match result.unwrap() {
+        GotoDefinitionResponse::Scalar(location) => {
+            assert_eq!(location.uri, uri);
+            assert_eq!(
+                location.range.start.line, 2,
+                "@method string string(...) is declared on line 2"
+            );
+        }
+        other => panic!("Expected Scalar location, got: {:?}", other),
+    }
+}