gopls: remove usage of golang.org/x/xerrors
As of golang/go#50827, gopls no longer supports building at 1.12, and so
usage of golang.org/x/xerrors can be replaced with the native support for
error wrapping introduced in Go 1.13.
Remove this usage as a step toward eliminating the xerrors dependency
from x/tools.
For golang/go#52442
Change-Id: Ibf459cc72402a30a6c2735dc620f76ed8a5e2525
Reviewed-on: https://go-review.googlesource.com/c/tools/+/401097
Run-TryBot: Robert Findley <rfindley@google.com>
gopls-CI: kokoro <noreply+kokoro@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@google.com>
diff --git a/internal/lsp/command.go b/internal/lsp/command.go
index 072ee08..5636f87 100644
--- a/internal/lsp/command.go
+++ b/internal/lsp/command.go
@@ -8,6 +8,7 @@
"bytes"
"context"
"encoding/json"
+ "errors"
"fmt"
"io"
"io/ioutil"
@@ -28,7 +29,6 @@
"golang.org/x/tools/internal/lsp/source"
"golang.org/x/tools/internal/span"
"golang.org/x/tools/internal/xcontext"
- errors "golang.org/x/xerrors"
)
func (s *Server) executeCommand(ctx context.Context, params *protocol.ExecuteCommandParams) (interface{}, error) {
@@ -83,7 +83,7 @@
}
}
if len(unsaved) > 0 {
- return errors.Errorf("All files must be saved first (unsaved: %v).", unsaved)
+ return fmt.Errorf("All files must be saved first (unsaved: %v).", unsaved)
}
}
var deps commandDeps
@@ -384,7 +384,7 @@
forURI: args.URI,
}, func(ctx context.Context, deps commandDeps) error {
if err := c.runTests(ctx, deps.snapshot, deps.work, args.URI, args.Tests, args.Benchmarks); err != nil {
- return errors.Errorf("running tests failed: %w", err)
+ return fmt.Errorf("running tests failed: %w", err)
}
return nil
})
@@ -689,15 +689,15 @@
defer release()
modFile, err := snapshot.BuildGoplsMod(ctx)
if err != nil {
- return errors.Errorf("getting workspace mod file: %w", err)
+ return fmt.Errorf("getting workspace mod file: %w", err)
}
content, err := modFile.Format()
if err != nil {
- return errors.Errorf("formatting mod file: %w", err)
+ return fmt.Errorf("formatting mod file: %w", err)
}
filename := filepath.Join(snapshot.View().Folder().Filename(), "gopls.mod")
if err := ioutil.WriteFile(filename, content, 0644); err != nil {
- return errors.Errorf("writing mod file: %w", err)
+ return fmt.Errorf("writing mod file: %w", err)
}
return nil
})
@@ -788,7 +788,7 @@
}
listenedAddr, err := di.Serve(ctx, addr)
if err != nil {
- return result, errors.Errorf("starting debug server: %w", err)
+ return result, fmt.Errorf("starting debug server: %w", err)
}
result.URLs = []string{"http://" + listenedAddr}
return result, nil
