mirror of
https://github.com/golang/go
synced 2024-10-01 10:28:31 -06:00
4d14fc9c00
This change is the first step in handling golang/go#38136. Instead of creating multiple diagnostic reports for type error analyzers, we add suggested fixes to the existing reports. To match the analyzers for FindAnalysisError, we add an ErrorMatch function to source.Analyzer. This is not an ideal solution, but it was the best one I could come up with without modifying the go/analysis API. analysisinternal could be used for this purpose, but it seemed to complicated to be worth it, and this is fairly simple. I think that go/analysis itself might need to be extended for type error analyzers, but these temporary measures will help us understand the kinds of features we need for type error analyzers. A follow-up CL might be to not add reports for type error analyzers until the end of source.Diagnostic, which would remove the need for the look-up. Fixes golang/go#38136 Change-Id: I25bc6396b09d49facecd918bf5591d2d5bdf1b3a Reviewed-on: https://go-review.googlesource.com/c/tools/+/226777 Run-TryBot: Rebecca Stambler <rstambler@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Heschi Kreinick <heschi@google.com>
75 lines
2.3 KiB
Go
75 lines
2.3 KiB
Go
// Copyright 2019 The Go Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package cmdtest
|
|
|
|
import (
|
|
"fmt"
|
|
"io/ioutil"
|
|
"strings"
|
|
"testing"
|
|
|
|
"golang.org/x/tools/internal/lsp/source"
|
|
"golang.org/x/tools/internal/span"
|
|
)
|
|
|
|
func (r *runner) Diagnostics(t *testing.T, uri span.URI, want []*source.Diagnostic) {
|
|
if len(want) == 1 && want[0].Message == "" {
|
|
return
|
|
}
|
|
if strings.Contains(uri.Filename(), "circular") {
|
|
t.Skip("skipping circular diagnostics tests due to golang/go#36265")
|
|
}
|
|
fname := uri.Filename()
|
|
out, _ := r.runGoplsCmd(t, "check", fname)
|
|
// parse got into a collection of reports
|
|
got := map[string]struct{}{}
|
|
for _, l := range strings.Split(out, "\n") {
|
|
if len(l) == 0 {
|
|
continue
|
|
}
|
|
// parse and reprint to normalize the span
|
|
bits := strings.SplitN(l, ": ", 2)
|
|
if len(bits) == 2 {
|
|
spn := span.Parse(strings.TrimSpace(bits[0]))
|
|
spn = span.New(spn.URI(), spn.Start(), span.Point{})
|
|
data, err := ioutil.ReadFile(fname)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
converter := span.NewContentConverter(fname, data)
|
|
s, err := spn.WithPosition(converter)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
l = fmt.Sprintf("%s: %s", s, strings.TrimSpace(bits[1]))
|
|
}
|
|
got[r.NormalizePrefix(l)] = struct{}{}
|
|
}
|
|
for _, diag := range want {
|
|
expect := fmt.Sprintf("%v:%v:%v: %v", uri.Filename(), diag.Range.Start.Line+1, diag.Range.Start.Character+1, diag.Message)
|
|
if diag.Range.Start.Character == 0 {
|
|
expect = fmt.Sprintf("%v:%v: %v", uri.Filename(), diag.Range.Start.Line+1, diag.Message)
|
|
}
|
|
expect = r.NormalizePrefix(expect)
|
|
// Skip the badimport and import cycle not allowed test for now, until we do a better job with diagnostic ranges.
|
|
if strings.Contains(uri.Filename(), "badimport") || strings.Contains(expect, "import cycle") {
|
|
continue
|
|
}
|
|
_, found := got[expect]
|
|
if !found {
|
|
t.Errorf("missing diagnostic %q, %v", expect, got)
|
|
} else {
|
|
delete(got, expect)
|
|
}
|
|
}
|
|
for extra := range got {
|
|
// Skip the badimport and import cycle not allowed test for now, until we do a better job with diagnostic ranges.
|
|
if strings.Contains(extra, "badimport") || strings.Contains(extra, "import cycle") {
|
|
continue
|
|
}
|
|
t.Errorf("extra diagnostic %q", extra)
|
|
}
|
|
}
|