[tools] gopls/internal/lsp/tests: use the mustRange helper in more places
0 views
Skip to first unread message
Robert Findley (Gerrit)
Sep 23, 2022, 9:51:49 AM9/23/22
to goph...@pubsubhelper.golang.org, golang-...@googlegroups.com, Gopher Robot, kokoro, Alan Donovan, golang-co...@googlegroups.com
Robert Findley submitted this change.
2 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
Approvals:
Alan Donovan: Looks good to me, approved
kokoro: gopls CI succeeded
Robert Findley: Run TryBots
Gopher Robot: TryBots succeeded
gopls/internal/lsp/tests: use the mustRange helper in more places
In order to narrow usage of tests.Data.t, use the mustRange helper in
more places.
For golang/go#54845
Change-Id: I446ca520fa76afb2bc10c1fd5a5765859176dd6a
Reviewed-on: https://go-review.googlesource.com/c/tools/+/432336
Reviewed-by: Alan Donovan <adon...@google.com>
TryBot-Result: Gopher Robot <go...@golang.org>
Run-TryBot: Robert Findley <rfin...@google.com>
gopls-CI: kokoro <noreply...@google.com>
---
M gopls/internal/lsp/tests/tests.go
1 file changed, 23 insertions(+), 39 deletions(-)
diff --git a/gopls/internal/lsp/tests/tests.go b/gopls/internal/lsp/tests/tests.go
index 39849ca..cae4af2 100644
--- a/gopls/internal/lsp/tests/tests.go
+++ b/gopls/internal/lsp/tests/tests.go
@@ -1123,19 +1123,8 @@
}
func (data *Data) collectCodeLens(spn span.Span, title, cmd string) {
- if _, ok := data.CodeLens[spn.URI()]; !ok {
- data.CodeLens[spn.URI()] = []protocol.CodeLens{}
- }
- m, err := data.Mapper(spn.URI())
- if err != nil {
- data.t.Fatalf("Mapper: %v", err)
- }
- rng, err := m.Range(spn)
- if err != nil {
- data.t.Fatalf("Range: %v", err)
- }
data.CodeLens[spn.URI()] = append(data.CodeLens[spn.URI()], protocol.CodeLens{
- Range: rng,
+ Range: data.mustRange(spn),
Command: protocol.Command{
Title: title,
Command: cmd,
@@ -1144,15 +1133,6 @@
}
func (data *Data) collectDiagnostics(spn span.Span, msgSource, msgPattern, msgSeverity string) {
- m, err := data.Mapper(spn.URI())
- if err != nil {
- data.t.Fatalf("Mapper: %v", err)
- }
- rng, err := m.Range(spn)
- if err != nil {
- data.t.Fatalf("Range: %v", err)
- }
-
severity := protocol.SeverityError
switch msgSeverity {
case "error":
@@ -1166,7 +1146,7 @@
}
data.Diagnostics[spn.URI()] = append(data.Diagnostics[spn.URI()], &source.Diagnostic{
- Range: rng,
+ Range: data.mustRange(spn),
Severity: severity,
Source: source.DiagnosticSource(msgSource),
Message: msgPattern,
@@ -1275,14 +1255,7 @@
func (data *Data) collectIncomingCalls(src span.Span, calls []span.Span) {
for _, call := range calls {
- m, err := data.Mapper(call.URI())
- if err != nil {
- data.t.Fatal(err)
- }
- rng, err := m.Range(call)
- if err != nil {
- data.t.Fatal(err)
- }
+ rng := data.mustRange(call)
// we're only comparing protocol.range
if data.CallHierarchy[src] != nil {
data.CallHierarchy[src].IncomingCalls = append(data.CallHierarchy[src].IncomingCalls,
@@ -1305,19 +1278,11 @@
data.CallHierarchy[src] = &CallHierarchyResult{}
}
for _, call := range calls {
- m, err := data.Mapper(call.URI())
- if err != nil {
- data.t.Fatal(err)
- }
- rng, err := m.Range(call)
- if err != nil {
- data.t.Fatal(err)
- }
// we're only comparing protocol.range
data.CallHierarchy[src].OutgoingCalls = append(data.CallHierarchy[src].OutgoingCalls,
protocol.CallHierarchyItem{
URI: protocol.DocumentURI(call.URI()),
- Range: rng,
+ Range: data.mustRange(call),
})
}
}
To view, visit change 432336. To unsubscribe, or for help writing mail filters, visit settings.
Reply all
Reply to author
Forward
0 new messages