From e3acd584e2df2ab36886e1577f4ea15f91335d1a Mon Sep 17 00:00:00 2001 From: Peter Weinberger Date: Thu, 13 Feb 2020 15:09:23 -0500 Subject: [PATCH] internal/lsp: two trivial cleanups from CL 219077 Change-Id: Ia55bfc4d8283589a7a70e2b7b2ed3265ead18d62 Reviewed-on: https://go-review.googlesource.com/c/tools/+/219378 Run-TryBot: Peter Weinberger Reviewed-by: Heschi Kreinick TryBot-Result: Gobot Gobot --- internal/lsp/cmd/prepare_rename.go | 4 +--- internal/lsp/lsp_test.go | 11 +++++------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/internal/lsp/cmd/prepare_rename.go b/internal/lsp/cmd/prepare_rename.go index b33a521cb4..40ee201f60 100644 --- a/internal/lsp/cmd/prepare_rename.go +++ b/internal/lsp/cmd/prepare_rename.go @@ -69,9 +69,7 @@ func (r *prepareRename) Run(ctx context.Context, args ...string) error { return fmt.Errorf("request is not valid at the given position") } - resRange := *result - - l := protocol.Location{Range: resRange} + l := protocol.Location{Range: *result} s, err := file.mapper.Span(l) if err != nil { return err diff --git a/internal/lsp/lsp_test.go b/internal/lsp/lsp_test.go index 6355b4cb5f..1047c00ce0 100644 --- a/internal/lsp/lsp_test.go +++ b/internal/lsp/lsp_test.go @@ -719,16 +719,15 @@ func (r *runner) PrepareRename(t *testing.T, src span.Span, want *source.Prepare } return } - xx := got - if xx.Start == xx.End { + if got.Start == got.End { // Special case for 0-length ranges. Marks can't specify a 0-length range, // so just compare the start. - if xx.Start != want.Range.Start { - t.Errorf("prepare rename failed: incorrect point, got %v want %v", xx.Start, want.Range.Start) + if got.Start != want.Range.Start { + t.Errorf("prepare rename failed: incorrect point, got %v want %v", got.Start, want.Range.Start) } } else { - if protocol.CompareRange(*xx, want.Range) != 0 { - t.Errorf("prepare rename failed: incorrect range got %v want %v", *xx, want.Range) + if protocol.CompareRange(*got, want.Range) != 0 { + t.Errorf("prepare rename failed: incorrect range got %v want %v", *got, want.Range) } } }