initGopPkg

goplus · Aug 19, 2021 · 5d89e6b · 5d89e6b
1 parent 4e6239c
commit 5d89e6b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/import.go b/import.go
@@ -147,9 +147,7 @@ func LoadGoPkg(at *Package, imports map[string]*PkgRef, loadPkg *packages.Packag
 	}
 	pkg, ok := imports[loadPkg.PkgPath]
 	pkgTypes := loadPkg.Types
-	if pkgTypes.Scope().Lookup("GopPackage") != nil { // is a Go+ package
-		initGopPkg(pkgTypes)
-	}
+	initGopPkg(pkgTypes)
 	if ok {
 		if pkg.ID == "" {
 			pkg.ID = loadPkg.ID
@@ -188,6 +186,9 @@ func calcFingerp(files []string) string {
 }
 
 func initGopPkg(pkg *types.Package) {
+	if pkg.Scope().Lookup("GopPackage") == nil { // not is a Go+ package
+		return
+	}
 	type omthd struct {
 		named *types.Named
 		mthd  string

diff --git a/persist.go b/persist.go
@@ -564,6 +564,7 @@ func fromPersistPkg(ctx *persistPkgCtx, pkg *persistPkgRef) *PkgRef {
 		o := fromPersistFunc(ctx, fn)
 		ctx.scope.Insert(o)
 	}
+	initGopPkg(ctx.pkg)
 	return ret
 }