commit 88b5529c9e152818a95a94bba07f34ce60532bb0
author Robert Findley <rfindley@google.com> Wed Sep 21 09:17:10 2022 -0400
committer Robert Findley <rfindley@google.com> Fri Sep 23 13:51:45 2022 +0000
tree 4acaee191954db326cbee5c0b936e348c96cb07a
parent c7ac94217faf546b95d699fb3749371b61213690

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 <adonovan@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Robert Findley <rfindley@google.com>
gopls-CI: kokoro <noreply+kokoro@google.com>

gopls/internal/lsp/tests/tests.go

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),
 			})
 	}
 }