gopls/internal/protocol: add DocumentURI.DirPath

findleyr · findleyr · commit c043599d4e9c · 2024-11-14T23:37:56.000Z
To simplify many callsites where we called filepath.Dir on uri.Path(), introduce the DocumentURI.DirPath helper method. This clarified many call sites, and could make it easier to optimize URI manipulation in the future. Change-Id: Icc64155b6bba631f9df5da5a05e3126c7cb7954b Reviewed-on: https://go-review.googlesource.com/c/tools/+/626716 LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Alan Donovan <adonovan@google.com>
diff --git a/gopls/internal/cache/check.go b/gopls/internal/cache/check.go
@@ -1782,7 +1782,7 @@ func depsErrors(ctx context.Context, snapshot *Snapshot, mp *metadata.Package) (
 		}
 	}
 
-	modFile, err := nearestModFile(ctx, mp.CompiledGoFiles[0], snapshot)
+	modFile, err := findRootPattern(ctx, mp.CompiledGoFiles[0].Dir(), "go.mod", snapshot)
 	if err != nil {
 		return nil, err
 	}
diff --git a/gopls/internal/cache/filemap.go b/gopls/internal/cache/filemap.go
@@ -104,7 +104,7 @@ func (m *fileMap) set(key protocol.DocumentURI, fh file.Handle) {
 
 // addDirs adds all directories containing u to the dirs set.
 func (m *fileMap) addDirs(u protocol.DocumentURI) {
-	dir := filepath.Dir(u.Path())
+	dir := u.DirPath()
 	for dir != "" && !m.dirs.Contains(dir) {
 		m.dirs.Add(dir)
 		dir = filepath.Dir(dir)
diff --git a/gopls/internal/cache/mod.go b/gopls/internal/cache/mod.go
@@ -8,7 +8,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"path/filepath"
 	"regexp"
 	"strings"
 
@@ -251,7 +250,7 @@ func modWhyImpl(ctx context.Context, snapshot *Snapshot, fh file.Handle) (map[st
 	for _, req := range pm.File.Require {
 		args = append(args, req.Mod.Path)
 	}
-	inv, cleanupInvocation, err := snapshot.GoCommandInvocation(false, filepath.Dir(fh.URI().Path()), "mod", args)
+	inv, cleanupInvocation, err := snapshot.GoCommandInvocation(false, fh.URI().DirPath(), "mod", args)
 	if err != nil {
 		return nil, err
 	}
diff --git a/gopls/internal/cache/mod_tidy.go b/gopls/internal/cache/mod_tidy.go
@@ -107,13 +107,8 @@ func modTidyImpl(ctx context.Context, snapshot *Snapshot, pm *ParsedModule) (*Ti
 	}
 	defer cleanup()
 
-	inv, cleanupInvocation, err := snapshot.GoCommandInvocation(
-		false,
-		pm.URI.Dir().Path(),
-		"mod",
-		[]string{"tidy", "-modfile=" + filepath.Join(tempDir, "go.mod")},
-		"GOWORK=off",
-	)
+	args := []string{"tidy", "-modfile=" + filepath.Join(tempDir, "go.mod")}
+	inv, cleanupInvocation, err := snapshot.GoCommandInvocation(false, pm.URI.DirPath(), "mod", args, "GOWORK=off")
 	if err != nil {
 		return nil, err
 	}
diff --git a/gopls/internal/cache/session.go b/gopls/internal/cache/session.go
@@ -191,7 +191,7 @@ func (s *Session) createView(ctx context.Context, def *viewDefinition) (*View, *
 		} else {
 			dirs = append(dirs, def.folder.Env.GOMODCACHE)
 			for m := range def.workspaceModFiles {
-				dirs = append(dirs, filepath.Dir(m.Path()))
+				dirs = append(dirs, m.DirPath())
 			}
 		}
 		ignoreFilter = newIgnoreFilter(dirs)
diff --git a/gopls/internal/cache/snapshot.go b/gopls/internal/cache/snapshot.go
@@ -375,7 +375,7 @@ func (s *Snapshot) RunGoModUpdateCommands(ctx context.Context, modURI protocol.D
 	// TODO(rfindley): we must use ModFlag and ModFile here (rather than simply
 	// setting Args), because without knowing the verb, we can't know whether
 	// ModFlag is appropriate. Refactor so that args can be set by the caller.
-	inv, cleanupInvocation, err := s.GoCommandInvocation(true, modURI.Dir().Path(), "", nil, "GOWORK=off")
+	inv, cleanupInvocation, err := s.GoCommandInvocation(true, modURI.DirPath(), "", nil, "GOWORK=off")
 	if err != nil {
 		return nil, nil, err
 	}
@@ -807,7 +807,7 @@ func (s *Snapshot) fileWatchingGlobPatterns() map[protocol.RelativePattern]unit
 	var dirs []string
 	if s.view.typ.usesModules() {
 		if s.view.typ == GoWorkView {
-			workVendorDir := filepath.Join(s.view.gowork.Dir().Path(), "vendor")
+			workVendorDir := filepath.Join(s.view.gowork.DirPath(), "vendor")
 			workVendorURI := protocol.URIFromPath(workVendorDir)
 			patterns[protocol.RelativePattern{BaseURI: workVendorURI, Pattern: watchGoFiles}] = unit{}
 		}
@@ -818,8 +818,7 @@ func (s *Snapshot) fileWatchingGlobPatterns() map[protocol.RelativePattern]unit
 		// The assumption is that the user is not actively editing non-workspace
 		// modules, so don't pay the price of file watching.
 		for modFile := range s.view.workspaceModFiles {
-			dir := filepath.Dir(modFile.Path())
-			dirs = append(dirs, dir)
+			dirs = append(dirs, modFile.DirPath())
 
 			// TODO(golang/go#64724): thoroughly test these patterns, particularly on
 			// on Windows.
@@ -1059,15 +1058,6 @@ func moduleForURI(modFiles map[protocol.DocumentURI]struct{}, uri protocol.Docum
 	return match
 }
 
-// nearestModFile finds the nearest go.mod file contained in the directory
-// containing uri, or a parent of that directory.
-//
-// The given uri must be a file, not a directory.
-func nearestModFile(ctx context.Context, uri protocol.DocumentURI, fs file.Source) (protocol.DocumentURI, error) {
-	dir := filepath.Dir(uri.Path())
-	return findRootPattern(ctx, protocol.URIFromPath(dir), "go.mod", fs)
-}
-
 // Metadata returns the metadata for the specified package,
 // or nil if it was not found.
 func (s *Snapshot) Metadata(id PackageID) *metadata.Package {
@@ -1350,7 +1340,7 @@ searchOverlays:
 		)
 		if initialErr != nil {
 			msg = fmt.Sprintf("initialization failed: %v", initialErr.MainError)
-		} else if goMod, err := nearestModFile(ctx, fh.URI(), s); err == nil && goMod != "" {
+		} else if goMod, err := findRootPattern(ctx, fh.URI().Dir(), "go.mod", file.Source(s)); err == nil && goMod != "" {
 			// Check if the file's module should be loadable by considering both
 			// loaded modules and workspace modules. The former covers cases where
 			// the file is outside of a workspace folder. The latter covers cases
@@ -1363,7 +1353,7 @@ searchOverlays:
 			// prescriptive diagnostic in the case that there is no go.mod file, but
 			// it is harder to be precise in that case, and less important.
 			if !(loadedMod || workspaceMod) {
-				modDir := filepath.Dir(goMod.Path())
+				modDir := goMod.DirPath()
 				viewDir := s.view.folder.Dir.Path()
 
 				// When the module is underneath the view dir, we offer
@@ -1664,7 +1654,7 @@ func (s *Snapshot) clone(ctx, bgCtx context.Context, changed StateChange, done f
 			continue // like with go.mod files, we only reinit when things change on disk
 		}
 		dir, base := filepath.Split(uri.Path())
-		if base == "go.work.sum" && s.view.typ == GoWorkView && dir == filepath.Dir(s.view.gowork.Path()) {
+		if base == "go.work.sum" && s.view.typ == GoWorkView && dir == s.view.gowork.DirPath() {
 			reinit = true
 		}
 		if base == "go.sum" {
@@ -1947,7 +1937,7 @@ func deleteMostRelevantModFile(m *persistent.Map[protocol.DocumentURI, *memoize.
 
 	m.Range(func(modURI protocol.DocumentURI, _ *memoize.Promise) {
 		if len(modURI) > len(mostRelevant) {
-			if pathutil.InDir(filepath.Dir(modURI.Path()), changedFile) {
+			if pathutil.InDir(modURI.DirPath(), changedFile) {
 				mostRelevant = modURI
 			}
 		}
@@ -1999,12 +1989,12 @@ func invalidatedPackageIDs(uri protocol.DocumentURI, known map[protocol.Document
 		}{fi, err}
 		return fi, err
 	}
-	dir := filepath.Dir(uri.Path())
+	dir := uri.DirPath()
 	fi, err := getInfo(dir)
 	if err == nil {
 		// Aggregate all possibly relevant package IDs.
 		for knownURI, ids := range known {
-			knownDir := filepath.Dir(knownURI.Path())
+			knownDir := knownURI.DirPath()
 			knownFI, err := getInfo(knownDir)
 			if err != nil {
 				continue
diff --git a/gopls/internal/cache/view.go b/gopls/internal/cache/view.go
@@ -673,11 +673,10 @@ func (s *Snapshot) initialize(ctx context.Context, firstAttempt bool) {
 				addError(modURI, fmt.Errorf("no module path for %s", modURI))
 				continue
 			}
-			moduleDir := filepath.Dir(modURI.Path())
 			// Previously, we loaded <modulepath>/... for each module path, but that
 			// is actually incorrect when the pattern may match packages in more than
 			// one module. See golang/go#59458 for more details.
-			scopes = append(scopes, moduleLoadScope{dir: moduleDir, modulePath: parsed.File.Module.Mod.Path})
+			scopes = append(scopes, moduleLoadScope{dir: modURI.DirPath(), modulePath: parsed.File.Module.Mod.Path})
 		}
 	} else {
 		scopes = append(scopes, viewLoadScope{})
@@ -826,7 +825,7 @@ func defineView(ctx context.Context, fs file.Source, folder *Folder, forFile fil
 	}
 	dir := folder.Dir.Path()
 	if forFile != nil {
-		dir = filepath.Dir(forFile.URI().Path())
+		dir = forFile.URI().DirPath()
 	}
 
 	def := new(viewDefinition)
diff --git a/gopls/internal/golang/addtest.go b/gopls/internal/golang/addtest.go
@@ -294,7 +294,7 @@ func AddTestForFunc(ctx context.Context, snapshot *cache.Snapshot, loc protocol.
 	}
 
 	testBase := strings.TrimSuffix(filepath.Base(loc.URI.Path()), ".go") + "_test.go"
-	goTestFileURI := protocol.URIFromPath(filepath.Join(loc.URI.Dir().Path(), testBase))
+	goTestFileURI := protocol.URIFromPath(filepath.Join(loc.URI.DirPath(), testBase))
 
 	testFH, err := snapshot.ReadFile(ctx, goTestFileURI)
 	if err != nil {
diff --git a/gopls/internal/golang/assembly.go b/gopls/internal/golang/assembly.go
@@ -30,7 +30,7 @@ import (
 // - cross-link jumps and block labels, like github.com/aclements/objbrowse.
 func AssemblyHTML(ctx context.Context, snapshot *cache.Snapshot, pkg *cache.Package, symbol string, web Web) ([]byte, error) {
 	// Compile the package with -S, and capture its stderr stream.
-	inv, cleanupInvocation, err := snapshot.GoCommandInvocation(false, pkg.Metadata().CompiledGoFiles[0].Dir().Path(), "build", []string{"-gcflags=-S", "."})
+	inv, cleanupInvocation, err := snapshot.GoCommandInvocation(false, pkg.Metadata().CompiledGoFiles[0].DirPath(), "build", []string{"-gcflags=-S", "."})
 	if err != nil {
 		return nil, err // e.g. failed to write overlays (rare)
 	}
diff --git a/gopls/internal/golang/completion/package.go b/gopls/internal/golang/completion/package.go
@@ -205,7 +205,7 @@ func packageSuggestions(ctx context.Context, snapshot *cache.Snapshot, fileURI p
 		}
 	}()
 
-	dirPath := filepath.Dir(fileURI.Path())
+	dirPath := fileURI.DirPath()
 	dirName := filepath.Base(dirPath)
 	if !isValidDirName(dirName) {
 		return packages, nil
@@ -227,7 +227,7 @@ func packageSuggestions(ctx context.Context, snapshot *cache.Snapshot, fileURI p
 		// Only add packages that are previously used in the current directory.
 		var relevantPkg bool
 		for _, uri := range mp.CompiledGoFiles {
-			if filepath.Dir(uri.Path()) == dirPath {
+			if uri.DirPath() == dirPath {
 				relevantPkg = true
 				break
 			}
diff --git a/gopls/internal/golang/embeddirective.go b/gopls/internal/golang/embeddirective.go
@@ -35,7 +35,7 @@ func embedDefinition(m *protocol.Mapper, pos protocol.Position) ([]protocol.Loca
 
 	// Find the first matching file.
 	var match string
-	dir := filepath.Dir(m.URI.Path())
+	dir := m.URI.DirPath()
 	err := filepath.WalkDir(dir, func(abs string, d fs.DirEntry, e error) error {
 		if e != nil {
 			return e
diff --git a/gopls/internal/golang/extracttofile.go b/gopls/internal/golang/extracttofile.go
@@ -146,7 +146,7 @@ func ExtractToNewFile(ctx context.Context, snapshot *cache.Snapshot, fh file.Han
 		buf.WriteString(")\n")
 	}
 
-	newFile, err := chooseNewFile(ctx, snapshot, pgf.URI.Dir().Path(), firstSymbol)
+	newFile, err := chooseNewFile(ctx, snapshot, pgf.URI.DirPath(), firstSymbol)
 	if err != nil {
 		return nil, fmt.Errorf("%s: %w", errorPrefix, err)
 	}
diff --git a/gopls/internal/golang/gc_annotations.go b/gopls/internal/golang/gc_annotations.go
@@ -32,7 +32,7 @@ func GCOptimizationDetails(ctx context.Context, snapshot *cache.Snapshot, mp *me
 	if len(mp.CompiledGoFiles) == 0 {
 		return nil, nil
 	}
-	pkgDir := filepath.Dir(mp.CompiledGoFiles[0].Path())
+	pkgDir := mp.CompiledGoFiles[0].DirPath()
 	outDir, err := os.MkdirTemp("", fmt.Sprintf("gopls-%d.details", os.Getpid()))
 	if err != nil {
 		return nil, err
@@ -86,7 +86,7 @@ func GCOptimizationDetails(ctx context.Context, snapshot *cache.Snapshot, mp *me
 		if fh == nil {
 			continue
 		}
-		if pkgDir != filepath.Dir(fh.URI().Path()) {
+		if pkgDir != fh.URI().DirPath() {
 			// https://github.com/golang/go/issues/42198
 			// sometimes the detail diagnostics generated for files
 			// outside the package can never be taken back.
diff --git a/gopls/internal/golang/hover.go b/gopls/internal/golang/hover.go
@@ -937,7 +937,7 @@ func hoverLit(pgf *parsego.File, lit *ast.BasicLit, pos token.Pos) (protocol.Ran
 func hoverEmbed(fh file.Handle, rng protocol.Range, pattern string) (protocol.Range, *hoverJSON, error) {
 	s := &strings.Builder{}
 
-	dir := filepath.Dir(fh.URI().Path())
+	dir := fh.URI().DirPath()
 	var matches []string
 	err := filepath.WalkDir(dir, func(abs string, d fs.DirEntry, e error) error {
 		if e != nil {
diff --git a/gopls/internal/golang/rename.go b/gopls/internal/golang/rename.go
@@ -605,7 +605,7 @@ func renamePackageName(ctx context.Context, s *cache.Snapshot, f file.Handle, ne
 	}
 
 	// Update the last component of the file's enclosing directory.
-	oldBase := filepath.Dir(f.URI().Path())
+	oldBase := f.URI().DirPath()
 	newPkgDir := filepath.Join(filepath.Dir(oldBase), string(newName))
 
 	// Update any affected replace directives in go.mod files.
@@ -625,7 +625,7 @@ func renamePackageName(ctx context.Context, s *cache.Snapshot, f file.Handle, ne
 			return nil, err
 		}
 
-		modFileDir := filepath.Dir(pm.URI.Path())
+		modFileDir := pm.URI.DirPath()
 		affectedReplaces := []*modfile.Replace{}
 
 		// Check if any replace directives need to be fixed
diff --git a/gopls/internal/mod/code_lens.go b/gopls/internal/mod/code_lens.go
@@ -113,7 +113,7 @@ func vendorLens(ctx context.Context, snapshot *cache.Snapshot, fh file.Handle) (
 	cmd := command.NewVendorCommand(title, command.URIArg{URI: uri})
 	// Change the message depending on whether or not the module already has a
 	// vendor directory.
-	vendorDir := filepath.Join(filepath.Dir(fh.URI().Path()), "vendor")
+	vendorDir := filepath.Join(fh.URI().DirPath(), "vendor")
 	if info, _ := os.Stat(vendorDir); info != nil && info.IsDir() {
 		title = "Sync vendor directory"
 	}
diff --git a/gopls/internal/protocol/uri.go b/gopls/internal/protocol/uri.go
@@ -90,7 +90,13 @@ func (uri DocumentURI) Path() string {
 func (uri DocumentURI) Dir() DocumentURI {
 	// This function could be more efficiently implemented by avoiding any call
 	// to Path(), but at least consolidates URI manipulation.
-	return URIFromPath(filepath.Dir(uri.Path()))
+	return URIFromPath(uri.DirPath())
+}
+
+// DirPath returns the file path to the directory containing this URI, which
+// must be a file URI.
+func (uri DocumentURI) DirPath() string {
+	return filepath.Dir(uri.Path())
 }
 
 // Encloses reports whether uri's path, considered as a sequence of segments,
diff --git a/gopls/internal/server/command.go b/gopls/internal/server/command.go
@@ -589,7 +589,7 @@ func (c *commandHandler) Vendor(ctx context.Context, args command.URIArg) error
 		// modules.txt in-place. In that case we could theoretically allow this
 		// command to run concurrently.
 		stderr := new(bytes.Buffer)
-		inv, cleanupInvocation, err := deps.snapshot.GoCommandInvocation(true, filepath.Dir(args.URI.Path()), "mod", []string{"vendor"})
+		inv, cleanupInvocation, err := deps.snapshot.GoCommandInvocation(true, args.URI.DirPath(), "mod", []string{"vendor"})
 		if err != nil {
 			return err
 		}
@@ -750,11 +750,8 @@ func (c *commandHandler) runTests(ctx context.Context, snapshot *cache.Snapshot,
 	// Run `go test -run Func` on each test.
 	var failedTests int
 	for _, funcName := range tests {
-		inv, cleanupInvocation, err := snapshot.GoCommandInvocation(false,
-			filepath.Dir(uri.Path()),
-			"test",
-			[]string{pkgPath, "-v", "-count=1", fmt.Sprintf("-run=^%s$", regexp.QuoteMeta(funcName))},
-		)
+		args := []string{pkgPath, "-v", "-count=1", fmt.Sprintf("-run=^%s$", regexp.QuoteMeta(funcName))}
+		inv, cleanupInvocation, err := snapshot.GoCommandInvocation(false, uri.DirPath(), "test", args)
 		if err != nil {
 			return err
 		}
@@ -770,11 +767,9 @@ func (c *commandHandler) runTests(ctx context.Context, snapshot *cache.Snapshot,
 	// Run `go test -run=^$ -bench Func` on each test.
 	var failedBenchmarks int
 	for _, funcName := range benchmarks {
-		inv, cleanupInvocation, err := snapshot.GoCommandInvocation(false,
-			filepath.Dir(uri.Path()),
-			"test",
-			[]string{pkgPath, "-v", "-run=^$", fmt.Sprintf("-bench=^%s$", regexp.QuoteMeta(funcName))},
-		)
+		inv, cleanupInvocation, err := snapshot.GoCommandInvocation(false, uri.DirPath(), "test", []string{
+			pkgPath, "-v", "-run=^$", fmt.Sprintf("-bench=^%s$", regexp.QuoteMeta(funcName)),
+		})
 		if err != nil {
 			return err
 		}
@@ -833,11 +828,7 @@ func (c *commandHandler) Generate(ctx context.Context, args command.GenerateArgs
 		if args.Recursive {
 			pattern = "./..."
 		}
-		inv, cleanupInvocation, err := deps.snapshot.GoCommandInvocation(true,
-			args.Dir.Path(),
-			"generate",
-			[]string{"-x", pattern},
-		)
+		inv, cleanupInvocation, err := deps.snapshot.GoCommandInvocation(true, args.Dir.Path(), "generate", []string{"-x", pattern})
 		if err != nil {
 			return err
 		}
@@ -866,9 +857,7 @@ func (c *commandHandler) GoGetPackage(ctx context.Context, args command.GoGetPac
 		}
 		defer cleanupModDir()
 
-		inv, cleanupInvocation, err := snapshot.GoCommandInvocation(true,
-			modURI.Dir().Path(),
-			"list",
+		inv, cleanupInvocation, err := snapshot.GoCommandInvocation(true, modURI.DirPath(), "list",
 			[]string{"-f", "{{.Module.Path}}@{{.Module.Version}}", "-mod=mod", "-modfile=" + filepath.Join(tempDir, "go.mod"), args.Pkg},
 			"GOWORK=off",
 		)
@@ -1001,12 +990,8 @@ func addModuleRequire(invoke func(...string) (*bytes.Buffer, error), args []stri
 
 // TODO(rfindley): inline.
 func (s *server) getUpgrades(ctx context.Context, snapshot *cache.Snapshot, uri protocol.DocumentURI, modules []string) (map[string]string, error) {
-	inv, cleanup, err := snapshot.GoCommandInvocation(true,
-		filepath.Dir(uri.Path()),
-		"list",
-		// -mod=readonly is necessary when vendor is present (golang/go#66055)
-		append([]string{"-mod=readonly", "-m", "-u", "-json"}, modules...),
-	)
+	args := append([]string{"-mod=readonly", "-m", "-u", "-json"}, modules...)
+	inv, cleanup, err := snapshot.GoCommandInvocation(true, uri.DirPath(), "list", args)
 	if err != nil {
 		return nil, err
 	}
@@ -1237,7 +1222,7 @@ func (c *commandHandler) Vulncheck(ctx context.Context, args command.VulncheckAr
 		jsonrpc2.Async(ctx) // run this in parallel with other requests: vulncheck can be slow.
 
 		workDoneWriter := progress.NewWorkDoneWriter(ctx, deps.work)
-		dir := filepath.Dir(args.URI.Path())
+		dir := args.URI.DirPath()
 		pattern := args.Pattern
 
 		result, err := scan.RunGovulncheck(ctx, pattern, deps.snapshot, dir, workDoneWriter)
diff --git a/gopls/internal/server/rename.go b/gopls/internal/server/rename.go
@@ -50,7 +50,7 @@ func (s *server) Rename(ctx context.Context, params *protocol.RenameParams) (*pr
 
 	if isPkgRenaming {
 		// Update the last component of the file's enclosing directory.
-		oldDir := filepath.Dir(fh.URI().Path())
+		oldDir := fh.URI().DirPath()
 		newDir := filepath.Join(filepath.Dir(oldDir), params.NewName)
 		change := protocol.DocumentChangeRename(
 			protocol.URIFromPath(oldDir),
diff --git a/gopls/internal/server/text_synchronization.go b/gopls/internal/server/text_synchronization.go
diff --git a/gopls/internal/work/completion.go b/gopls/internal/work/completion.go
diff --git a/gopls/internal/work/diagnostics.go b/gopls/internal/work/diagnostics.go

Original file line number	Diff line number	Diff line change
`@@ -1782,7 +1782,7 @@ func depsErrors(ctx context.Context, snapshot Snapshot, mp metadata.Package) (`
`1782`	`1782`	`}`
`1783`	`1783`	`}`
`1784`	`1784`
`1785`		`- modFile, err := nearestModFile(ctx, mp.CompiledGoFiles[0], snapshot)`
	`1785`	`+ modFile, err := findRootPattern(ctx, mp.CompiledGoFiles[0].Dir(), "go.mod", snapshot)`
`1786`	`1786`	`if err != nil {`
`1787`	`1787`	`return nil, err`
`1788`	`1788`	`}`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ func (s Session) createView(ctx context.Context, def viewDefinition) (View, `
`191`	`191`	`} else {`
`192`	`192`	`dirs = append(dirs, def.folder.Env.GOMODCACHE)`
`193`	`193`	`for m := range def.workspaceModFiles {`
`194`		`- dirs = append(dirs, filepath.Dir(m.Path()))`
	`194`	`+ dirs = append(dirs, m.DirPath())`
`195`	`195`	`}`
`196`	`196`	`}`
`197`	`197`	`ignoreFilter = newIgnoreFilter(dirs)`
Original file line number	Diff line number	Diff line change
`@@ -673,11 +673,10 @@ func (s *Snapshot) initialize(ctx context.Context, firstAttempt bool) {`
`673`	`673`	`addError(modURI, fmt.Errorf("no module path for %s", modURI))`
`674`	`674`	`continue`
`675`	`675`	`}`
`676`		`- moduleDir := filepath.Dir(modURI.Path())`
`677`	`676`	`// Previously, we loaded <modulepath>/... for each module path, but that`
`678`	`677`	`// is actually incorrect when the pattern may match packages in more than`
`679`	`678`	`// one module. See golang/go#59458 for more details.`
`680`		`- scopes = append(scopes, moduleLoadScope{dir: moduleDir, modulePath: parsed.File.Module.Mod.Path})`
	`679`	`+ scopes = append(scopes, moduleLoadScope{dir: modURI.DirPath(), modulePath: parsed.File.Module.Mod.Path})`
`681`	`680`	`}`
`682`	`681`	`} else {`
`683`	`682`	`scopes = append(scopes, viewLoadScope{})`
`@@ -826,7 +825,7 @@ func defineView(ctx context.Context, fs file.Source, folder *Folder, forFile fil`
`826`	`825`	`}`
`827`	`826`	`dir := folder.Dir.Path()`
`828`	`827`	`if forFile != nil {`
`829`		`- dir = filepath.Dir(forFile.URI().Path())`
	`828`	`+ dir = forFile.URI().DirPath()`
`830`	`829`	`}`
`831`	`830`
`832`	`831`	`def := new(viewDefinition)`
Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ func AddTestForFunc(ctx context.Context, snapshot *cache.Snapshot, loc protocol.`
`294`	`294`	`}`
`295`	`295`
`296`	`296`	`testBase := strings.TrimSuffix(filepath.Base(loc.URI.Path()), ".go") + "_test.go"`
`297`		`- goTestFileURI := protocol.URIFromPath(filepath.Join(loc.URI.Dir().Path(), testBase))`
	`297`	`+ goTestFileURI := protocol.URIFromPath(filepath.Join(loc.URI.DirPath(), testBase))`
`298`	`298`
`299`	`299`	`testFH, err := snapshot.ReadFile(ctx, goTestFileURI)`
`300`	`300`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ import (`
`30`	`30`	`// - cross-link jumps and block labels, like github.com/aclements/objbrowse.`
`31`	`31`	`func AssemblyHTML(ctx context.Context, snapshot cache.Snapshot, pkg cache.Package, symbol string, web Web) ([]byte, error) {`
`32`	`32`	`// Compile the package with -S, and capture its stderr stream.`
`33`		`- inv, cleanupInvocation, err := snapshot.GoCommandInvocation(false, pkg.Metadata().CompiledGoFiles[0].Dir().Path(), "build", []string{"-gcflags=-S", "."})`
	`33`	`+ inv, cleanupInvocation, err := snapshot.GoCommandInvocation(false, pkg.Metadata().CompiledGoFiles[0].DirPath(), "build", []string{"-gcflags=-S", "."})`
`34`	`34`	`if err != nil {`
`35`	`35`	`return nil, err // e.g. failed to write overlays (rare)`
`36`	`36`	`}`