fix: resolve java method calls to long signature definitions correctly (#183)

* fix: resolve java method calls to long signature definitions correctly

* fix(java): resolve internal method calls using two-pass approach

When a method calls another method that is defined later in the same class, the current single-pass logic fails to find the callee method symbol and creates a stub. This commit introduces a two-pass approach within `processClass`:
1. Iterate over methods and create definitions/symbols.
2. Iterate over methods again to process method calls and resolve them against the symbols created in the first pass.

Author: li-jin-gou

go.mod

@@ -23,6 +23,7 @@ require (
 	github.com/stretchr/testify v1.10.0
 	github.com/vifraa/gopom v1.0.0
 	golang.org/x/mod v0.24.0
+	golang.org/x/sync v0.13.0
 	golang.org/x/tools v0.32.0
 )
 
@@ -91,7 +92,6 @@ require (
 	golang.org/x/arch v0.14.0 // indirect
 	golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa // indirect
 	golang.org/x/net v0.39.0 // indirect
-	golang.org/x/sync v0.13.0 // indirect
 	golang.org/x/sys v0.33.0 // indirect
 	golang.org/x/text v0.24.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect

lang/collect/collect.go

@@ -26,8 +26,8 @@ import (
 	"sync"
 	"unicode"
 
-	"golang.org/x/sync/errgroup"
 	sitter "github.com/smacker/go-tree-sitter"
+	"golang.org/x/sync/errgroup"
 
 	"github.com/cloudwego/abcoder/lang/cpp"
 	"github.com/cloudwego/abcoder/lang/cxx"
@@ -819,7 +819,13 @@ func (c *Collector) ScannerByJavaIPC(ctx context.Context) ([]*DocumentSymbol, er
 			}
 		}
 
-		// 4) Methods (and method calls)
+		// 4) Methods (Pass 1: Definitions)
+		type methodAndSym struct {
+			m    *javapb.MethodDetail
+			msym *DocumentSymbol
+		}
+		var methodSyms []methodAndSym
+
 		for _, m := range ci.Methods {
 			if m == nil {
 				continue
@@ -852,6 +858,12 @@ func (c *Collector) ScannerByJavaIPC(ctx context.Context) ([]*DocumentSymbol, er
 			}
 			if n := m.GetName(); n != "" {
 				methodSymByKey[methodKey(fqcn, n)] = msym
+				shortName := strings.TrimSpace(n)
+				parts := strings.Split(shortName, " ")
+				shortName = parts[len(parts)-1]
+				if shortName != "" && shortName != n {
+					methodSymByKey[methodKey(fqcn, shortName)] = msym
+				}
 			}
 
 			// Fill functionInfo
@@ -900,12 +912,23 @@ func (c *Collector) ScannerByJavaIPC(ctx context.Context) ([]*DocumentSymbol, er
 				}
 			}
 			c.funcs[msym] = finfo
+			methodSyms = append(methodSyms, methodAndSym{m: m, msym: msym})
+		}
+
+		// 5) Process method calls (Pass 2)
+		for _, pair := range methodSyms {
+			m := pair.m
+			msym := pair.msym
 
-			// Method calls
 			for _, call := range m.MethodCalls {
-				if call == nil || call.CalleeClass == "" {
+				if call == nil {
+					continue
+				}
+
+				if call.CalleeClass == "" {
 					continue
 				}
+
 				calleeInfo := resolveClass(call.CalleeClass)
 				if calleeInfo == nil {
 					// drop if callee class can't be resolved
@@ -924,23 +947,29 @@ func (c *Collector) ScannerByJavaIPC(ctx context.Context) ([]*DocumentSymbol, er
 				if call.CalleeMethod != "" {
 					if s, ok := methodSymByKey[methodKey(call.CalleeClass, call.CalleeMethod)]; ok {
 						calleeMethodSym = s
+					} else {
+						shortName := call.CalleeMethod
+						if idx := strings.IndexByte(shortName, '('); idx >= 0 {
+							shortName = shortName[:idx]
+						}
+						parts := strings.Split(shortName, " ")
+						shortName = parts[len(parts)-1]
+						if s, ok := methodSymByKey[methodKey(call.CalleeClass, shortName)]; ok {
+							calleeMethodSym = s
+						}
 					}
 				}
 				if calleeMethodSym == nil {
 					// Create a lightweight stub method symbol (one-layer only).
 					// IMPORTANT: do NOT put it into c.syms to avoid clobbering class symbols.
 					stubLoc := Location{URI: calleeClassSym.Location.URI, Range: Range{Start: calleeClassSym.Location.Range.Start, End: calleeClassSym.Location.Range.Start}}
 					calleeMethodSym = &DocumentSymbol{
-						Name:     call.CalleeMethod,
+						Name:     calleeClassSym.Name + "." + call.CalleeMethod,
 						Kind:     SKMethod,
 						Text:     "",
 						Location: stubLoc,
 						Role:     DEFINITION,
 					}
-
-					if _, ok := localByName[call.CalleeClass]; !ok {
-						calleeMethodSym.Name = call.CalleeClass + "." + call.CalleeMethod
-					}
 				}
 
 				tokFile := normalizePath(call.FilePath)