gopls/internal/lsp/cmd: remove vestiges of debugging golang/go#59475

Updates golang/go#59475

Change-Id: Ib775deeff902e2eba4a99fb970374063897da7df
Reviewed-on: https://go-review.googlesource.com/c/tools/+/497396
Auto-Submit: Alan Donovan <adonovan@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Robert Findley <rfindley@google.com>
Run-TryBot: Alan Donovan <adonovan@google.com>

Author: adonovan

gopls/internal/lsp/cmd/cmd.go

@@ -518,11 +518,6 @@ func (c *cmdClient) ApplyEdit(ctx context.Context, p *protocol.ApplyWorkspaceEdi
 }
 
 func (c *cmdClient) PublishDiagnostics(ctx context.Context, p *protocol.PublishDiagnosticsParams) error {
-	var debug = os.Getenv(DebugSuggestedFixEnvVar) == "true"
-	if debug {
-		log.Printf("PublishDiagnostics URI=%v Diagnostics=%v", p.URI, p.Diagnostics)
-	}
-
 	if p.URI == "gopls://diagnostics-done" {
 		close(c.diagnosticsDone)
 	}

gopls/internal/lsp/cmd/suggested_fix.go

@@ -9,7 +9,6 @@ import (
 	"flag"
 	"fmt"
 	"io/ioutil"
-	"log"
 	"os"
 
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
@@ -42,16 +41,11 @@ fix-flags:
 	printFlagDefaults(f)
 }
 
-const DebugSuggestedFixEnvVar = "_DEBUG_SUGGESTED_FIX"
-
 // Run performs diagnostic checks on the file specified and either;
 // - if -w is specified, updates the file in place;
 // - if -d is specified, prints out unified diffs of the changes; or
 // - otherwise, prints the new versions to stdout.
 func (s *suggestedFix) Run(ctx context.Context, args ...string) error {
-	// For debugging golang/go#59475, enable some additional output.
-	var debug = os.Getenv(DebugSuggestedFixEnvVar) == "true"
-
 	if len(args) < 1 {
 		return tool.CommandLineErrorf("fix expects at least 1 argument")
 	}
@@ -80,9 +74,6 @@ func (s *suggestedFix) Run(ctx context.Context, args ...string) error {
 	conn.Client.filesMu.Lock()
 	diagnostics = append(diagnostics, file.diagnostics...)
 	conn.Client.filesMu.Unlock()
-	if debug {
-		log.Printf("file diagnostics: %#v", diagnostics)
-	}
 
 	// Request code actions
 	codeActionKinds := []protocol.CodeActionKind{protocol.QuickFix}
@@ -106,9 +97,6 @@ func (s *suggestedFix) Run(ctx context.Context, args ...string) error {
 	if err != nil {
 		return fmt.Errorf("%v: %v", from, err)
 	}
-	if debug {
-		log.Printf("code actions: %#v", actions)
-	}
 
 	// Gather edits from matching code actions.
 	var edits []protocol.TextEdit

gopls/internal/lsp/cmd/test/integration_test.go

@@ -890,10 +890,7 @@ func goplsWithEnv(t *testing.T, dir string, env []string, args ...string) *resul
 	}
 
 	goplsCmd := exec.Command(os.Args[0], args...)
-	goplsCmd.Env = append(os.Environ(),
-		"ENTRYPOINT=goplsMain",
-		fmt.Sprintf("%s=true", cmd.DebugSuggestedFixEnvVar),
-	)
+	goplsCmd.Env = append(os.Environ(), "ENTRYPOINT=goplsMain")
 	goplsCmd.Env = append(goplsCmd.Env, env...)
 	goplsCmd.Dir = dir
 	goplsCmd.Stdout = new(bytes.Buffer)