Skip to content

Commit f7da307

Browse files
committed
udpate to go1.23, handle aliases in Universe scope
1 parent ea5259f commit f7da307

3 files changed

Lines changed: 17 additions & 14 deletions

File tree

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
module github.com/monoidic/go-api-parser
22

3-
go 1.22.0
3+
go 1.23.2
44

55
require (
6-
golang.org/x/mod v0.19.0
7-
golang.org/x/tools v0.23.0
6+
golang.org/x/mod v0.21.0
7+
golang.org/x/tools v0.26.0
88
)
99

10-
require golang.org/x/sync v0.7.0 // indirect
10+
require golang.org/x/sync v0.8.0 // indirect

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8=
2-
golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
3-
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
4-
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
5-
golang.org/x/tools v0.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg=
6-
golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI=
1+
golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=
2+
golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
3+
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
4+
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
5+
golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ=
6+
golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=

parse.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
//go:debug gotypesalias=1
2-
31
package main
42

53
import (
@@ -204,7 +202,7 @@ func (pkg *pkgData) getTypeName(iface types.Type, name string) string {
204202
switch dt := iface.(type) {
205203
case *types.Named:
206204
obj := dt.Obj()
207-
if pkg := obj.Pkg(); pkg == nil {
205+
if obj.Pkg() == nil {
208206
// universe scope
209207
return obj.Name()
210208
}
@@ -288,7 +286,12 @@ func (pkg *pkgData) parseStruct(name string, obj *types.Struct, typeParams *type
288286
}
289287

290288
func getTypeName(tn *types.TypeName) string {
291-
return fmt.Sprintf("%s.%s", tn.Pkg().Path(), tn.Name())
289+
pkg := tn.Pkg()
290+
if pkg == nil {
291+
// universe scope
292+
return tn.Name()
293+
}
294+
return fmt.Sprintf("%s.%s", pkg.Path(), tn.Name())
292295
}
293296

294297
func getTypeParamArr(typeParams *types.TypeParamList) []string {

0 commit comments

Comments
 (0)