gopls/internal/lsp: simplify mod update commands

There's no reason not to use a temp modfile for these commands, since
they can instead mutate modfiles via use ApplyEdits.

We should not support two ways to make the same change.

For golang/go#63537

Change-Id: I2f9abbddb544e6cbf4bc2f98efd83c8cba038645
Reviewed-on: https://go-review.googlesource.com/c/tools/+/542641
Reviewed-by: Alan Donovan <[email protected]>
LUCI-TryBot-Result: Go LUCI <[email protected]>

Author: findleyr

gopls/internal/lsp/cache/snapshot.go

@@ -474,21 +474,16 @@ func (s *Snapshot) RunGoCommandPiped(ctx context.Context, mode source.Invocation
 	return s.view.gocmdRunner.RunPiped(ctx, *inv, stdout, stderr)
 }
 
-// RunGoCommands runs a series of `go` commands that updates the go.mod
+// RunGoModUpdateCommands runs a series of `go` commands that updates the go.mod
 // and go.sum file for wd, and returns their updated contents.
-func (s *Snapshot) RunGoCommands(ctx context.Context, allowNetwork bool, wd string, run func(invoke func(...string) (*bytes.Buffer, error)) error) (bool, []byte, []byte, error) {
-	var flags source.InvocationFlags
-	if s.workspaceMode()&tempModfile != 0 {
-		flags = source.WriteTemporaryModFile
-	} else {
-		flags = source.Normal
-	}
-	if allowNetwork {
-		flags |= source.AllowNetwork
-	}
+//
+// TODO(rfindley): the signature of RunGoModUpdateCommands is very confusing.
+// Simplify it.
+func (s *Snapshot) RunGoModUpdateCommands(ctx context.Context, wd string, run func(invoke func(...string) (*bytes.Buffer, error)) error) ([]byte, []byte, error) {
+	flags := source.WriteTemporaryModFile | source.AllowNetwork
 	tmpURI, inv, cleanup, err := s.goCommandInvocation(ctx, flags, &gocommand.Invocation{WorkingDir: wd})
 	if err != nil {
-		return false, nil, nil, err
+		return nil, nil, err
 	}
 	defer cleanup()
 	invoke := func(args ...string) (*bytes.Buffer, error) {
@@ -497,21 +492,21 @@ func (s *Snapshot) RunGoCommands(ctx context.Context, allowNetwork bool, wd stri
 		return s.view.gocmdRunner.Run(ctx, *inv)
 	}
 	if err := run(invoke); err != nil {
-		return false, nil, nil, err
+		return nil, nil, err
 	}
 	if flags.Mode() != source.WriteTemporaryModFile {
-		return false, nil, nil, nil
+		return nil, nil, nil
 	}
 	var modBytes, sumBytes []byte
 	modBytes, err = os.ReadFile(tmpURI.Path())
 	if err != nil && !os.IsNotExist(err) {
-		return false, nil, nil, err
+		return nil, nil, err
 	}
 	sumBytes, err = os.ReadFile(strings.TrimSuffix(tmpURI.Path(), ".mod") + ".sum")
 	if err != nil && !os.IsNotExist(err) {
-		return false, nil, nil, err
+		return nil, nil, err
 	}
-	return true, modBytes, sumBytes, nil
+	return modBytes, sumBytes, nil
 }
 
 // goCommandInvocation populates inv with configuration for running go commands on the snapshot.

gopls/internal/lsp/command.go

@@ -628,13 +628,10 @@ func (c *commandHandler) GoGetPackage(ctx context.Context, args command.GoGetPac
 }
 
 func (s *server) runGoModUpdateCommands(ctx context.Context, snapshot *cache.Snapshot, uri protocol.DocumentURI, run func(invoke func(...string) (*bytes.Buffer, error)) error) error {
-	tmpModfile, newModBytes, newSumBytes, err := snapshot.RunGoCommands(ctx, true, filepath.Dir(uri.Path()), run)
+	newModBytes, newSumBytes, err := snapshot.RunGoModUpdateCommands(ctx, filepath.Dir(uri.Path()), run)
 	if err != nil {
 		return err
 	}
-	if !tmpModfile {
-		return nil
-	}
 	modURI := snapshot.GoModForFile(uri)
 	sumURI := protocol.URIFromPath(strings.TrimSuffix(modURI.Path(), ".mod") + ".sum")
 	modEdits, err := collectFileEdits(ctx, snapshot, modURI, newModBytes)

gopls/internal/lsp/source/snapshot.go

@@ -282,7 +282,6 @@ const (
 	// LoadWorkspace is for packages.Load, and other operations that should
 	// consider the whole workspace at once.
 	LoadWorkspace
-
 	// AllowNetwork is a flag bit that indicates the invocation should be
 	// allowed to access the network.
 	AllowNetwork InvocationFlags = 1 << 10