mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

internal/lsp/diff: remove unused TokenConverter parameters 

Change-Id: Icb0b4d5c2d45eafdb1f23278e3828206a7f36908
Reviewed-on: https://go-review.googlesource.com/c/tools/+/408094
Reviewed-by: Peter Weinberger <pjw@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Alan Donovan <adonovan@google.com>
Run-TryBot: Robert Findley <rfindley@google.com>
gopls-CI: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Robert Findley 2022-05-23 23:11:53 -04:00
parent de3ef4aa45
commit dae3f4bf3c
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/lsp/diff/diff.go
View File

@ -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 {

4
internal/lsp/diff/unified.go
View File

@ -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