Address failing go-to-definition cases

Author: AJenbo

docs/CHANGELOG.md

@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- **Docblock navigation.** Go-to-definition and hover now work on class names inside callable type annotations (`\Closure(Request): Response`), and Ctrl+Click on object shape properties (`$profile->name` from `@return object{name: string}`) jumps to the key inside the docblock.
+
+### Fixed
+
+- **GTD for `@method`/`@property` on interfaces.** Go-to-definition now walks implemented interfaces (own and from parents) before checking `@mixin` classes, so virtual members declared on interfaces resolve correctly.
+- **`?->` null-safe chain resolution.** The `rfind("->")` split incorrectly matched the `->` inside `?->`, leaving a trailing `?` on the left-hand side. Fixed at all seven call sites across resolver, text resolution, handler, foreach resolution, and signature help.
+- **`(new Canvas())->easel` property access.** Parenthesized `new` expressions on the left side of `->` now resolve correctly for variable type inference.
+- **Array function resolution.** `array_pop`, `array_filter`, `array_values`, `end`, and `array_map` now resolve element types correctly for go-to-definition and completion when the array comes from a method call chain or a `$var->prop` access.
+
 ## [0.4.0] - 2026-03-01
 
 ### Added

docs/todo.md

@@ -788,13 +788,32 @@ branches in `TypeSpecifier::specifyTypesInCondition`.
 
 ---
 
+### 24. Go-to-definition for array shape keys via bracket access
+**Impact: Low · Effort: Medium**
+
+Array shape keys accessed via bracket notation (`$status['code']`)
+have no go-to-definition support. The type comes from a
+`@phpstan-type` / `@phpstan-import-type` alias or a direct
+`@var` / `@return` annotation resolved to
+`array{code: int, label: string}`, but Ctrl+Click on the string
+key inside `['code']` does nothing.
+
+Object shape properties (`$profile->name` from
+`@return object{name: string}`) already jump to the property key
+in the docblock. Extending the same approach to bracket-access
+array shapes would require detecting the array key context in the
+GTD path (similar to array shape completion) and searching for the
+key inside the matching `array{…}` annotation.
+
+---
+
 <!-- ============================================================ -->
 <!--  TIER 5 — LOW IMPACT                                         -->
 <!-- ============================================================ -->
 
 ## Low Impact
 
-### 24. Short-name collisions in `find_implementors`
+### 25. Short-name collisions in `find_implementors`
 **Impact: Low · Effort: Low**
 
 `class_implements_or_extends` matches interfaces by both short name and
@@ -810,7 +829,7 @@ before comparison.
 
 ---
 
-### 25. Fiber type resolution
+### 26. Fiber type resolution
 **Impact: Low · Effort: Low**
 
 `Generator<TKey, TValue, TSend, TReturn>` has dedicated support for
@@ -825,7 +844,7 @@ Generator extraction in `docblock/types.rs`.
 
 ---
 
-### 26. Non-empty-string propagation through string functions
+### 27. Non-empty-string propagation through string functions
 **Impact: Low · Effort: Low**
 
 PHPStan tracks `non-empty-string` through string-manipulating
@@ -843,7 +862,7 @@ See `NonEmptyStringFunctionsReturnTypeExtension` in PHPStan.
 
 ---
 
-### 27. `Closure::bind()` / `Closure::fromCallable()` return type preservation
+### 28. `Closure::bind()` / `Closure::fromCallable()` return type preservation
 **Impact: Low · Effort: Low-Medium**
 
 Variables holding closure literals, arrow functions, and first-class
@@ -859,7 +878,7 @@ See `ClosureBindDynamicReturnTypeExtension` and
 
 ---
 
-### 28. Remove deprecated text-search fallbacks
+### 29. Remove deprecated text-search fallbacks
 **Impact: Low · Effort: Medium**
 
 The go-to-definition subsystem now uses the precomputed `SymbolMap` as
@@ -891,7 +910,7 @@ would let that deprecated function be removed entirely.
 
 ---
 
-### 29. Non-array functions with dynamic return types
+### 30. Non-array functions with dynamic return types
 **Impact: Low · Effort: High**
 
 PHPStan also provides dynamic return type extensions for many non-array
@@ -922,7 +941,7 @@ return types (less impactful for class-based completion).
 
 ---
 
-### 30. Language construct signature help and hover
+### 31. Language construct signature help and hover
 **Impact: Low · Effort: Low**
 
 PHP language constructs that use parentheses (`unset()`, `isset()`, `empty()`,
@@ -939,22 +958,22 @@ need a similar hardcoded lookup.
 
 ---
 
-### 31. Diagnostics
+### 32. Diagnostics
 **Impact: Low (large scope) · Effort: Very High**
 
 No error reporting (undefined methods, type mismatches, etc.).
 
 ---
 
-### 32. Code Actions
+### 33. Code Actions
 **Impact: Low · Effort: Very High**
 
 No quick fixes or refactoring suggestions. No `codeActionProvider` in
 `ServerCapabilities`, no `textDocument/codeAction` handler, and no
 `WorkspaceEdit` generation infrastructure beyond trivial `TextEdit`s for
 use-statement insertion.
 
-#### 32a. Extract Function refactoring
+#### 33a. Extract Function refactoring
 
 Select a range of statements inside a method/function and extract them into a
 new function. The LSP would need to:
@@ -975,7 +994,7 @@ new function. The LSP would need to:
 |---|---|
 | Hover (§1) | "Resolve type at arbitrary position" — needed to type params |
 | Document Symbols (§12) | AST range → symbol mapping — needed to find enclosing function and valid insertion points |
-| Find References (§8) | Variable usage tracking across a scope — the same "which variables are used where" analysis |
+| Find References (§7) | Variable usage tracking across a scope — the same "which variables are used where" analysis |
 | Simple code actions (add use stmt, implement interface) | Builds the code action + `WorkspaceEdit` plumbing |
 
 ---

example.php

@@ -411,8 +411,8 @@ public function demo(): void
     {
         /** @var object{title: string, score: float} $item */
         $item = getUnknownValue();
-        $item->title;                             // object shape property
-        $item->score;
+        $item->title;                             // Ctrl+Click → jumps to `title:` in docblock above
+        $item->score;                             // Ctrl+Click → jumps to `score:` in docblock above
     }
 }
 
@@ -733,11 +733,11 @@ public function demo(): void
 
         // Object shapes
         $profile = $this->getProfile();
-        $profile->name;                   // object{name: string, ...}
+        $profile->name;                   // Ctrl+Click → jumps to `name:` in @return docblock
 
         $result = $this->getResult();
-        $result->tool->write();           // nested object → Pen
-        $result->meta->page;              // nested object shape
+        $result->tool->write();           // Ctrl+Click `tool` → jumps to `tool:` in @return docblock
+        $result->meta->page;              // Ctrl+Click `meta` → jumps to `meta:` in @return docblock
     }
 
     /** @return array{pen: Pen, pencil: Pencil, active: bool} */
@@ -1410,6 +1410,17 @@ public function returnType(): GtdResult { return new GtdResult(); }
      * @throws GtdNotFoundException                Ctrl+Click GtdNotFoundException
      */
     public function docblockTypes($items) { return $items; }
+
+    /**
+     * Callable types in docblocks. Ctrl+Click on any class name inside the
+     * callable signature to jump to its definition. Hover shows the class
+     * info instead of treating the whole callable as one token.
+     *
+     * @param \Closure(GtdAlpha): GtdResult $transform      Ctrl+Click GtdAlpha or GtdResult
+     * @param callable(GtdAlpha, GtdBeta): GtdResult $merge Ctrl+Click any of the three
+     * @return callable(): GtdResult                         Ctrl+Click GtdResult
+     */
+    public function callableDocblockTypes($transform, $merge) { return $merge; }
 }
 
 class GtdAlpha { public function label(): string { return 'alpha'; } }

src/completion/foreach_resolution.rs

@@ -612,7 +612,9 @@ impl Backend {
                     {
                         // Split at the last `->` to get the object and method name.
                         if let Some(arrow_pos) = call_body.rfind("->") {
-                            let obj_text = &call_body[..arrow_pos];
+                            let obj_text = call_body[..arrow_pos]
+                                .strip_suffix('?')
+                                .unwrap_or(&call_body[..arrow_pos]);
                             let method_name = &call_body[arrow_pos + 2..];
                             let current_class =
                                 all_classes.iter().find(|c| c.name == current_class_name);

src/completion/handler.rs

@@ -1213,7 +1213,8 @@ impl Backend {
 
         // ── Instance method: `$subject->method` ─────────────────────
         if let Some(pos) = expr.rfind("->") {
-            let subject = &expr[..pos];
+            // Strip trailing `?` from subject when the operator was `?->`
+            let subject = expr[..pos].strip_suffix('?').unwrap_or(&expr[..pos]);
             let method_name = &expr[pos + 2..];
 
             let owner_classes: Vec<crate::ClassInfo> = if subject == "$this"

src/completion/resolver.rs

@@ -475,7 +475,11 @@ impl Backend {
         let function_loader = ctx.function_loader;
         // ── Instance method call: $this->method / $var->method ──
         if let Some(pos) = call_body.rfind("->") {
-            let lhs = &call_body[..pos];
+            // Strip trailing `?` from LHS when the operator was `?->`
+            // (e.g. `$maybe?->getCanvas` splits into lhs=`$maybe?`).
+            let lhs = call_body[..pos]
+                .strip_suffix('?')
+                .unwrap_or(&call_body[..pos]);
             let method_name = &call_body[pos + 2..];
 
             // Resolve the left-hand side to a class (recursively handles
@@ -1482,7 +1486,10 @@ impl Backend {
         {
             // Instance method chain: `expr->method()`
             if let Some(pos) = call_body.rfind("->") {
-                let lhs = &call_body[..pos];
+                // Strip trailing `?` from LHS when the operator was `?->`
+                let lhs = call_body[..pos]
+                    .strip_suffix('?')
+                    .unwrap_or(&call_body[..pos]);
                 let method_name = &call_body[pos + 2..];
 
                 let lhs_classes = Self::resolve_target_classes(lhs, AccessKind::Arrow, ctx);
@@ -1518,7 +1525,10 @@ impl Backend {
 
         // ── Property access: `$this->prop` or `$var->prop` ──────────────
         if let Some(pos) = arg_text.rfind("->") {
-            let lhs = &arg_text[..pos];
+            // Strip trailing `?` from LHS when the operator was `?->`
+            let lhs = arg_text[..pos]
+                .strip_suffix('?')
+                .unwrap_or(&arg_text[..pos]);
             let prop_name = &arg_text[pos + 2..];
             if !prop_name.is_empty() && prop_name.chars().all(|c| c.is_alphanumeric() || c == '_') {
                 let lhs_classes = Self::resolve_target_classes(lhs, AccessKind::Arrow, ctx);