diff --git a/internal/golangorgx/gopls/debug/serve.go b/internal/golangorgx/gopls/debug/serve.go index 4473937f9f2..66f643cc2fa 100644 --- a/internal/golangorgx/gopls/debug/serve.go +++ b/internal/golangorgx/gopls/debug/serve.go @@ -394,9 +394,9 @@ func (i *Instance) SetLogFile(logfile string, isDaemon bool) (func(), error) { if logfile != "" { if logfile == "auto" { if isDaemon { - logfile = filepath.Join(os.TempDir(), fmt.Sprintf("gopls-daemon-%d.log", os.Getpid())) + logfile = filepath.Join(os.TempDir(), fmt.Sprintf("cuepls-daemon-%d.log", os.Getpid())) } else { - logfile = filepath.Join(os.TempDir(), fmt.Sprintf("gopls-%d.log", os.Getpid())) + logfile = filepath.Join(os.TempDir(), fmt.Sprintf("cuepls-%d.log", os.Getpid())) } } f, err := os.Create(logfile) diff --git a/internal/golangorgx/gopls/golang/gc_annotations.go b/internal/golangorgx/gopls/golang/gc_annotations.go index b3ae50aa4e5..6ab1c566f30 100644 --- a/internal/golangorgx/gopls/golang/gc_annotations.go +++ b/internal/golangorgx/gopls/golang/gc_annotations.go @@ -25,12 +25,12 @@ func GCOptimizationDetails(ctx context.Context, snapshot *cache.Snapshot, mp *me return nil, nil } pkgDir := filepath.Dir(mp.CompiledGoFiles[0].Path()) - outDir := filepath.Join(os.TempDir(), fmt.Sprintf("gopls-%d.details", os.Getpid())) + outDir := filepath.Join(os.TempDir(), fmt.Sprintf("cuepls-%d.details", os.Getpid())) if err := os.MkdirAll(outDir, 0700); err != nil { return nil, err } - tmpFile, err := os.CreateTemp(os.TempDir(), "gopls-x") + tmpFile, err := os.CreateTemp(os.TempDir(), "cuepls-x") if err != nil { return nil, err } diff --git a/internal/golangorgx/gopls/server/command.go b/internal/golangorgx/gopls/server/command.go index 205b8264e39..48e0319be27 100644 --- a/internal/golangorgx/gopls/server/command.go +++ b/internal/golangorgx/gopls/server/command.go @@ -883,7 +883,7 @@ func (c *commandHandler) StartDebugging(ctx context.Context, args command.Debugg } func (c *commandHandler) StartProfile(ctx context.Context, args command.StartProfileArgs) (result command.StartProfileResult, _ error) { - file, err := os.CreateTemp("", "gopls-profile-*") + file, err := os.CreateTemp("", "cuepls-profile-*") if err != nil { return result, fmt.Errorf("creating temp profile file: %v", err) } diff --git a/internal/golangorgx/gopls/server/general.go b/internal/golangorgx/gopls/server/general.go index fe209d30d53..f89437e7b8b 100644 --- a/internal/golangorgx/gopls/server/general.go +++ b/internal/golangorgx/gopls/server/general.go @@ -55,7 +55,7 @@ func (s *server) Initialize(ctx context.Context, params *protocol.ParamInitializ // pid). Some clients might start multiple gopls servers, though they // probably shouldn't. pid := os.Getpid() - s.tempDir = filepath.Join(os.TempDir(), fmt.Sprintf("gopls-%d.%s", pid, s.session.ID())) + s.tempDir = filepath.Join(os.TempDir(), fmt.Sprintf("cuepls-%d.%s", pid, s.session.ID())) err := os.Mkdir(s.tempDir, 0700) if err != nil { // MkdirTemp could fail due to permissions issues. This is a problem with diff --git a/internal/golangorgx/gopls/test/integration/fake/sandbox.go b/internal/golangorgx/gopls/test/integration/fake/sandbox.go index a8c19613b4c..8bd079547b8 100644 --- a/internal/golangorgx/gopls/test/integration/fake/sandbox.go +++ b/internal/golangorgx/gopls/test/integration/fake/sandbox.go @@ -91,7 +91,7 @@ func NewSandbox(config *SandboxConfig) (_ *Sandbox, err error) { rootDir := config.RootDir if rootDir == "" { - rootDir, err = os.MkdirTemp(config.RootDir, "gopls-sandbox-") + rootDir, err = os.MkdirTemp(config.RootDir, "cuepls-sandbox-") if err != nil { return nil, fmt.Errorf("creating temporary workdir: %v", err) } @@ -149,7 +149,7 @@ func NewSandbox(config *SandboxConfig) (_ *Sandbox, err error) { // is the responsibility of the caller to call os.RemoveAll on the returned // file path when it is no longer needed. func Tempdir(files map[string][]byte) (string, error) { - dir, err := os.MkdirTemp("", "gopls-tempdir-") + dir, err := os.MkdirTemp("", "cuepls-tempdir-") if err != nil { return "", err } diff --git a/internal/golangorgx/gopls/test/integration/regtest.go b/internal/golangorgx/gopls/test/integration/regtest.go index c928b9466e0..b5cefa544ec 100644 --- a/internal/golangorgx/gopls/test/integration/regtest.go +++ b/internal/golangorgx/gopls/test/integration/regtest.go @@ -147,7 +147,7 @@ func Main(m *testing.M, hook func(*settings.Options)) { } } - dir, err := os.MkdirTemp("", "gopls-test-") + dir, err := os.MkdirTemp("", "cuepls-test-") if err != nil { panic(fmt.Errorf("creating temp directory: %v", err)) } diff --git a/internal/golangorgx/gopls/test/integration/runner.go b/internal/golangorgx/gopls/test/integration/runner.go index 077837c4fd0..18069342e44 100644 --- a/internal/golangorgx/gopls/test/integration/runner.go +++ b/internal/golangorgx/gopls/test/integration/runner.go @@ -368,12 +368,12 @@ func (r *Runner) separateProcessServer(optsHook func(*settings.Options)) jsonrpc } r.startRemoteOnce.Do(func() { - socketDir, err := os.MkdirTemp(r.tempDir, "gopls-test-socket") + socketDir, err := os.MkdirTemp(r.tempDir, "cuepls-test-socket") if err != nil { r.remoteErr = err return } - r.remoteSocket = filepath.Join(socketDir, "gopls-test-daemon") + r.remoteSocket = filepath.Join(socketDir, "cuepls-test-daemon") // The server should be killed by when the test runner exits, but to be // conservative also set a listen timeout. diff --git a/internal/golangorgx/gopls/util/goversion/goversion.go b/internal/golangorgx/gopls/util/goversion/goversion.go index 5b849b22b85..35772bf7b39 100644 --- a/internal/golangorgx/gopls/util/goversion/goversion.go +++ b/internal/golangorgx/gopls/util/goversion/goversion.go @@ -84,7 +84,7 @@ func Message(goVersion int, fromBuild bool) (string, bool) { } fmt.Fprintf(&msgBuilder, "Please upgrade to Go 1.%d or later and reinstall gopls. ", OldestSupported()) fmt.Fprintf(&msgBuilder, "If you can't upgrade and want this message to go away, please install gopls %s. ", v.InstallGoplsVersion) - fmt.Fprint(&msgBuilder, "See https://go.dev/s/gopls-support-policy for more details.") + fmt.Fprint(&msgBuilder, "See https://go.dev/s/cuepls-support-policy for more details.") return msgBuilder.String(), isError }