internal/lsp: fix applyTextDocumentEdits and delete extra function
Follow-up from CL24645 246458.
Change-Id: I77872154e2aa2d6028add84dadc5d8aad05b59ee
Reviewed-on: https://go-review.googlesource.com/c/tools/+/246759
Run-TryBot: Rebecca Stambler <rstambler@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Josh Baum <joshbaum@google.com>
diff --git a/internal/lsp/lsp_test.go b/internal/lsp/lsp_test.go
index 2695095..4446741 100644
--- a/internal/lsp/lsp_test.go
+++ b/internal/lsp/lsp_test.go
@@ -454,12 +454,12 @@
if err != nil {
t.Fatal(err)
}
- res, err = applySuggestedFixEdits(r, edits)
+ res, err = applyTextDocumentEdits(r, edits)
if err != nil {
t.Fatal(err)
}
} else {
- res, err = applySuggestedFixEdits(r, action.Edit.DocumentChanges)
+ res, err = applyTextDocumentEdits(r, action.Edit.DocumentChanges)
if err != nil {
t.Fatal(err)
}
@@ -858,24 +858,6 @@
res := map[span.URI]string{}
for _, docEdits := range edits {
uri := docEdits.TextDocument.URI.SpanURI()
- m, err := r.data.Mapper(uri)
- if err != nil {
- return nil, err
- }
- res[uri] = string(m.Content)
- sedits, err := source.FromProtocolEdits(m, docEdits.Edits)
- if err != nil {
- return nil, err
- }
- res[uri] = applyEdits(res[uri], sedits)
- }
- return res, nil
-}
-
-func applySuggestedFixEdits(r *runner, edits []protocol.TextDocumentEdit) (map[span.URI]string, error) {
- res := map[span.URI]string{}
- for _, docEdits := range edits {
- uri := docEdits.TextDocument.URI.SpanURI()
var m *protocol.ColumnMapper
// If we have already edited this file, we use the edited version (rather than the
// file in its original state) so that we preserve our initial changes.
