Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down Expand Up @@ -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
Expand Down
47 changes: 38 additions & 9 deletions lang/collect/collect.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion testdata/asts/localsession_g.json

Large diffs are not rendered by default.

Loading