made requested changes from prior ticket and did some cleanup

grantnelson-wf · grantnelson-wf · commit 5740abfa8060 · 2025-02-26T10:45:12.000-07:00
diff --git a/build/build.go b/build/build.go
@@ -27,9 +27,9 @@ import (
 	"github.com/fsnotify/fsnotify"
 	"github.com/gopherjs/gopherjs/compiler"
 	"github.com/gopherjs/gopherjs/compiler/astutil"
-	"github.com/gopherjs/gopherjs/compiler/errorList"
 	"github.com/gopherjs/gopherjs/compiler/jsFile"
 	"github.com/gopherjs/gopherjs/compiler/sources"
+	"github.com/gopherjs/gopherjs/internal/errorList"
 	"github.com/gopherjs/gopherjs/internal/testmain"
 	log "github.com/sirupsen/logrus"
 
@@ -967,7 +967,7 @@ func (s *Session) loadTestPackage(pkg *PackageData) (*sources.Sources, error) {
 	}
 
 	// Import dependencies for the testmain package.
-	for _, importedPkgPath := range srcs.Imports() {
+	for _, importedPkgPath := range srcs.UnresolvedImports() {
 		_, _, err := s.loadImportPathWithSrcDir(importedPkgPath, pkg.Dir)
 		if err != nil {
 			return nil, err
@@ -1037,6 +1037,10 @@ var getExeModTime = func() func() time.Time {
 	}
 }()
 
+// loadPackages will recursively load and parse the given package and
+// its dependencies. This will return the sources for the given package.
+// The returned source and sources for the dependencies will be added
+// to the session's sources map.
 func (s *Session) loadPackages(pkg *PackageData) (*sources.Sources, error) {
 	if srcs, ok := s.sources[pkg.ImportPath]; ok {
 		return srcs, nil
@@ -1089,7 +1093,7 @@ func (s *Session) loadPackages(pkg *PackageData) (*sources.Sources, error) {
 
 	// Import dependencies from the augmented files,
 	// whilst skipping any that have been already imported.
-	for _, importedPkgPath := range srcs.Imports(pkg.Imports...) {
+	for _, importedPkgPath := range srcs.UnresolvedImports(pkg.Imports...) {
 		_, _, err := s.loadImportPathWithSrcDir(importedPkgPath, pkg.Dir)
 		if err != nil {
 			return nil, err
diff --git a/compiler/linkname.go b/compiler/linkname.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 
 	"github.com/gopherjs/gopherjs/compiler/astutil"
-	"github.com/gopherjs/gopherjs/compiler/errorList"
 	"github.com/gopherjs/gopherjs/compiler/internal/symbol"
+	"github.com/gopherjs/gopherjs/internal/errorList"
 )
 
 // GoLinkname describes a go:linkname compiler directive found in the source code.
diff --git a/compiler/package.go b/compiler/package.go
@@ -9,12 +9,12 @@ import (
 
 	"golang.org/x/tools/go/types/typeutil"
 
-	"github.com/gopherjs/gopherjs/compiler/errorList"
 	"github.com/gopherjs/gopherjs/compiler/internal/analysis"
 	"github.com/gopherjs/gopherjs/compiler/internal/dce"
 	"github.com/gopherjs/gopherjs/compiler/internal/typeparams"
 	"github.com/gopherjs/gopherjs/compiler/sources"
 	"github.com/gopherjs/gopherjs/compiler/typesutil"
+	"github.com/gopherjs/gopherjs/internal/errorList"
 	"github.com/gopherjs/gopherjs/internal/experiments"
 )
 
diff --git a/compiler/sources/errorCollectingImporter.go b/compiler/sources/errorCollectingImporter.go
@@ -3,7 +3,7 @@ package sources
 import (
 	"go/types"
 
-	"github.com/gopherjs/gopherjs/compiler/errorList"
+	"github.com/gopherjs/gopherjs/internal/errorList"
 )
 
 // errorCollectingImporter implements go/types.Importer interface and
diff --git a/compiler/sources/sources.go b/compiler/sources/sources.go
@@ -7,8 +7,8 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/gopherjs/gopherjs/compiler/errorList"
 	"github.com/gopherjs/gopherjs/compiler/jsFile"
+	"github.com/gopherjs/gopherjs/internal/errorList"
 	"github.com/neelance/astrewrite"
 )
 
@@ -114,12 +114,17 @@ func (s Sources) TypeCheck(importer types.Importer, sizes types.Sizes, tContext
 	return typesInfo, typesPkg, nil
 }
 
-// Imports calculates the import paths of the package's dependencies
+// UnresolvedImports calculates the import paths of the package's dependencies
 // based on all the imports in the augmented Go AST files.
 //
-// The given skip paths will not be returned in the results.
+// This is used to determine the unresolved imports that weren't in the
+// PackageData.Imports slice since they were added during augmentation or
+// during template generation.
+//
+// The given skip paths (typically those imports from PackageData.Imports)
+// will not be returned in the results.
 // This will not return any `*_test` packages in the results.
-func (s Sources) Imports(skip ...string) []string {
+func (s Sources) UnresolvedImports(skip ...string) []string {
 	seen := make(map[string]struct{})
 	for _, sk := range skip {
 		seen[sk] = struct{}{}
diff --git a/internal/errorList/errorList.go b/internal/errorList/errorList.go
diff --git a/tool.go b/tool.go
@@ -26,7 +26,7 @@ import (
 	gbuild "github.com/gopherjs/gopherjs/build"
 	"github.com/gopherjs/gopherjs/build/cache"
 	"github.com/gopherjs/gopherjs/compiler"
-	"github.com/gopherjs/gopherjs/compiler/errorList"
+	"github.com/gopherjs/gopherjs/internal/errorList"
 	"github.com/gopherjs/gopherjs/internal/sysutil"
 	"github.com/neelance/sourcemap"
 	log "github.com/sirupsen/logrus"

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ import (`
`7`	`7`	`"strings"`
`8`	`8`
`9`	`9`	`"github.com/gopherjs/gopherjs/compiler/astutil"`
`10`		`- "github.com/gopherjs/gopherjs/compiler/errorList"`
`11`	`10`	`"github.com/gopherjs/gopherjs/compiler/internal/symbol"`
	`11`	`+ "github.com/gopherjs/gopherjs/internal/errorList"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`// GoLinkname describes a go:linkname compiler directive found in the source code.`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package sources`
`3`	`3`	`import (`
`4`	`4`	`"go/types"`
`5`	`5`
`6`		`- "github.com/gopherjs/gopherjs/compiler/errorList"`
	`6`	`+ "github.com/gopherjs/gopherjs/internal/errorList"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`// errorCollectingImporter implements go/types.Importer interface and`