specify module's disk path to NewPkg

Author: chlowell

src/go/cmd/module.go

@@ -89,7 +89,7 @@ func NewModule(dir string) (*Module, error) {
 					return filepath.SkipDir
 				}
 			}
-			p, err := NewPkg(path, m.ModFile.Module.Mod.Path)
+			p, err := NewPkg(path, m.ModFile.Module.Mod.Path, dir)
 			if err == nil {
 				m.Packages[baseImportPath+p.Name()] = p
 			} else if !errors.Is(err, ErrNoPackages) {

src/go/cmd/pkg.go

@@ -51,8 +51,11 @@ type Pkg struct {
 }
 
 // NewPkg loads the package in the specified directory.
-// It's required there is only one package in the directory.
-func NewPkg(dir, modulePath string) (*Pkg, error) {
+//
+//   - dir is the directory containing the package
+//   - modulePath is the import path of the module containing the package
+//   - moduleRoot is the root directory of the module on disk (used to compute the package's relative name e.g. "azcore/log")
+func NewPkg(dir, modulePath, moduleRoot string) (*Pkg, error) {
 	pk := &Pkg{
 		modulePath:  modulePath,
 		c:           newContent(),
@@ -61,12 +64,8 @@ func NewPkg(dir, modulePath string) (*Pkg, error) {
 	}
 	modulePathWithoutVersion := strings.TrimSuffix(versionReg.ReplaceAllString(modulePath, "/"), "/")
 	moduleName := filepath.Base(modulePathWithoutVersion)
-	if _, after, found := strings.Cut(dir, moduleName); found {
-		pk.relName = moduleName
-		if after != "" && after[0] != '@' {
-			pk.relName += after
-		}
-		pk.relName = strings.ReplaceAll(pk.relName, "\\", "/")
+	if _, after, found := strings.Cut(dir, moduleRoot); found {
+		pk.relName = strings.ReplaceAll(moduleName+after, "\\", "/")
 	} else {
 		return nil, errors.New(dir + " isn't part of module " + moduleName)
 	}