internal/lsp: fix two more staticcheck warnings
Found by running:
$ staticcheck --checks all ./internal/lsp/...
And then manually checking the results.
Change-Id: I6a0abf72596de6539c19bb0244860c5bd0ac8fd1
Reviewed-on: https://go-review.googlesource.com/c/tools/+/258917
Reviewed-by: Rebecca Stambler <rstambler@golang.org>
Trust: Rebecca Stambler <rstambler@golang.org>
Trust: Heschi Kreinick <heschi@google.com>
Run-TryBot: Rebecca Stambler <rstambler@golang.org>
gopls-CI: kokoro <noreply+kokoro@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
diff --git a/internal/lsp/lsp_test.go b/internal/lsp/lsp_test.go
index 34d8316..3bb180f 100644
--- a/internal/lsp/lsp_test.go
+++ b/internal/lsp/lsp_test.go
@@ -182,10 +182,9 @@
// Get the diagnostics for this view if we have not done it before.
v := r.server.session.View(r.data.Config.Dir)
r.collectDiagnostics(v)
- var got []*source.Diagnostic
- for _, d := range r.diagnostics[uri] {
- got = append(got, d)
- }
+ d := r.diagnostics[uri]
+ got := make([]*source.Diagnostic, len(d))
+ copy(got, d)
// A special case to test that there are no diagnostics for a file.
if len(want) == 1 && want[0].Source == "no_diagnostics" {
if len(got) != 0 {
diff --git a/internal/lsp/source/options.go b/internal/lsp/source/options.go
index 0ce5fb7..c1084af 100644
--- a/internal/lsp/source/options.go
+++ b/internal/lsp/source/options.go
@@ -510,8 +510,8 @@
return result
}
-func (options *Options) AddStaticcheckAnalyzer(a *analysis.Analyzer) {
- options.StaticcheckAnalyzers[a.Name] = Analyzer{Analyzer: a, Enabled: true}
+func (o *Options) AddStaticcheckAnalyzer(a *analysis.Analyzer) {
+ o.StaticcheckAnalyzers[a.Name] = Analyzer{Analyzer: a, Enabled: true}
}
func (o *Options) set(name string, value interface{}) OptionResult {
