From dae3f4bf3c337d6972fe56c81a811a5ab7f81d41 Mon Sep 17 00:00:00 2001 From: Robert Findley Date: Mon, 23 May 2022 23:11:53 -0400 Subject: [PATCH] internal/lsp/diff: remove unused TokenConverter parameters Change-Id: Icb0b4d5c2d45eafdb1f23278e3828206a7f36908 Reviewed-on: https://go-review.googlesource.com/c/tools/+/408094 Reviewed-by: Peter Weinberger TryBot-Result: Gopher Robot Reviewed-by: Alan Donovan Run-TryBot: Robert Findley gopls-CI: kokoro --- internal/lsp/diff/diff.go | 12 ++++++------ internal/lsp/diff/unified.go | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/lsp/diff/diff.go b/internal/lsp/diff/diff.go index 5d8c69ca52..06e05a6048 100644 --- a/internal/lsp/diff/diff.go +++ b/internal/lsp/diff/diff.go @@ -44,7 +44,7 @@ func ApplyEdits(before string, edits []TextEdit) string { if len(edits) == 0 { return before } - _, edits, _ = prepareEdits(before, edits) + edits, _ = prepareEdits(before, edits) after := strings.Builder{} last := 0 for _, edit := range edits { @@ -68,15 +68,15 @@ func LineEdits(before string, edits []TextEdit) []TextEdit { if len(edits) == 0 { return nil } - c, edits, partial := prepareEdits(before, edits) + edits, partial := prepareEdits(before, edits) if partial { - edits = lineEdits(before, c, edits) + edits = lineEdits(before, edits) } return edits } // prepareEdits returns a sorted copy of the edits -func prepareEdits(before string, edits []TextEdit) (*span.TokenConverter, []TextEdit, bool) { +func prepareEdits(before string, edits []TextEdit) ([]TextEdit, bool) { partial := false c := span.NewContentConverter("", []byte(before)) copied := make([]TextEdit, len(edits)) @@ -88,11 +88,11 @@ func prepareEdits(before string, edits []TextEdit) (*span.TokenConverter, []Text edit.Span.Start().Column() > 1 || edit.Span.End().Column() > 1 } SortTextEdits(copied) - return c, copied, partial + return copied, partial } // lineEdits rewrites the edits to always be full line edits -func lineEdits(before string, c *span.TokenConverter, edits []TextEdit) []TextEdit { +func lineEdits(before string, edits []TextEdit) []TextEdit { adjusted := make([]TextEdit, 0, len(edits)) current := TextEdit{Span: span.Invalid} for _, edit := range edits { diff --git a/internal/lsp/diff/unified.go b/internal/lsp/diff/unified.go index b2e630effe..323471d204 100644 --- a/internal/lsp/diff/unified.go +++ b/internal/lsp/diff/unified.go @@ -83,9 +83,9 @@ func ToUnified(from, to string, content string, edits []TextEdit) Unified { if len(edits) == 0 { return u } - c, edits, partial := prepareEdits(content, edits) + edits, partial := prepareEdits(content, edits) if partial { - edits = lineEdits(content, c, edits) + edits = lineEdits(content, edits) } lines := splitLines(content) var h *Hunk