Skip to content

Use Origin() in Go extractor #13739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
owen-mc merged 3 commits into from
Jul 18, 2023
Merged

Use Origin() in Go extractor #13739

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cff09d2
Test if Origin() works (for Var and Func)
owen-mc Jul 14, 2023
a2a2e93
Fix printing when one obj is nil
owen-mc Jul 14, 2023
a7469ce
Use Origin()
owen-mc Jul 17, 2023
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
48 changes: 7 additions & 41 deletions go/extractor/extractor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1946,48 +1946,14 @@ func populateTypeParamParents(tw *trap.Writer, typeparams *types.TypeParamList,
// some changes to the object to avoid returning objects relating to instantiated
// types.
func getObjectBeingUsed(tw *trap.Writer, ident *ast.Ident) types.Object {
obj := tw.Package.TypesInfo.Uses[ident]
if obj == nil {
return nil
}
if override, ok := tw.ObjectsOverride[obj]; ok {
return override
}
if funcObj, ok := obj.(*types.Func); ok {
sig := funcObj.Type().(*types.Signature)
if recv := sig.Recv(); recv != nil {
recvType := recv.Type()
originType, isSame := tryGetGenericType(recvType)

if originType == nil {
if pointerType, ok := recvType.(*types.Pointer); ok {
originType, isSame = tryGetGenericType(pointerType.Elem())
}
}

if originType == nil || isSame {
return obj
}

for i := 0; i < originType.NumMethods(); i++ {
meth := originType.Method(i)
if meth.Name() == funcObj.Name() {
return meth
}
}
if interfaceType, ok := originType.Underlying().(*types.Interface); ok {
for i := 0; i < interfaceType.NumMethods(); i++ {
meth := interfaceType.Method(i)
if meth.Name() == funcObj.Name() {
return meth
}
}
}
log.Fatalf("Could not find method %s on type %s", funcObj.Name(), originType)
}
switch obj := tw.Package.TypesInfo.Uses[ident].(type) {
case *types.Var:
return obj.Origin()
case *types.Func:
return obj.Origin()
default:
return obj
}

return obj
}

// tryGetGenericType returns the generic type of `tp`, and a boolean indicating
Expand Down