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
8 changes: 6 additions & 2 deletions gopls/internal/lsp/source/references.go
Original file line number Diff line number Diff line change
Expand Up @@ -619,8 +619,12 @@ func localReferences(pkg Package, targets map[types.Object]bool, correspond bool
for _, pgf := range pkg.CompiledGopFiles() {
gopast.Inspect(pgf.File, func(n gopast.Node) bool {
if id, ok := n.(*gopast.Ident); ok {
if obj, ok := pkg.GopTypesInfo().Uses[id]; ok && matches(obj) {
report(gopMustLocation(pgf, id), false)
if obj, ok := pkg.GopTypesInfo().Uses[id]; ok {
// goxls: use overload declaration to match
overdecl, _ := pkg.GopTypesInfo().OverloadOf(id)
if matches(obj) || (overdecl != nil && matches(overdecl)) {
report(gopMustLocation(pgf, id), false)
}
}
}
return true
Expand Down
42 changes: 27 additions & 15 deletions gopls/internal/lsp/source/xrefs/xrefs_gox.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,26 +48,38 @@ func gopIndex(
obj = typeparams.OriginMethod(fn)
}

objects := getObjects(obj.Pkg())
gobObj, ok := objects[obj]
if !ok {
path, err := objectpathFor(obj)
if err != nil {
// Capitalized but not exported
// (e.g. local const/var/type).
return true
reportRef := func(obj types.Object) error {
objects := getObjects(obj.Pkg())
gobObj, ok := objects[obj]
if !ok {
path, err := objectpathFor(obj)
if err != nil {
// Capitalized but not exported
// (e.g. local const/var/type).
return err
}
gobObj = &gobObject{Path: path}
objects[obj] = gobObj
}
gobObj = &gobObject{Path: path}
objects[obj] = gobObj

gobObj.GopRefs = append(gobObj.GopRefs, gobRef{
FileIndex: fileIndex,
Range: nodeRange(n),
})
return nil
}

gobObj.GopRefs = append(gobObj.GopRefs, gobRef{
FileIndex: fileIndex,
Range: nodeRange(n),
})
// goxls:overload use,refer its overload decl & overload members
if err := reportRef(obj); err != nil {
return true
}
if odObj, _ := info.OverloadOf(n); odObj != nil {
if err := reportRef(odObj); err != nil {
return true
}
}
}
//}

case *ast.ImportSpec:
// Report a reference from each import path
// string to the imported package.
Expand Down
Loading