mirror of
https://github.com/golang/go
synced 2024-10-01 10:38:33 -06:00
de023d59a5
With #34111, we are forwarding the LSP from one gopls instance to another. This exposed an asymmetry in our LSP dispatching: for both ClientDispatcher and ServerDispatcher, we unmarshal to non-nil response structs. This means that when forwarding the LSP, we translate empty JSON responses (corresponding to nil values) into the non-nil zero value. This causes problems for some editors, as reported in #37570. Fix it by instead unmarshaling to a pointer. This is, of course, a somewhat dangerous change. I fixed the one NPE that occurred in tests, and have done some mild manual testing. I wouldn't be surprised if we discover more NPEs later on, but I still think this is the right change to make. Updates golang/go#34111 Fixes golang/go#37570 Change-Id: Ie69e92d2821c829cdfc4f4ab303679a725f1f859 Reviewed-on: https://go-review.googlesource.com/c/tools/+/222058 Reviewed-by: Peter Weinberger <pjw@google.com> Reviewed-by: Rebecca Stambler <rstambler@golang.org> Run-TryBot: Robert Findley <rfindley@google.com> TryBot-Result: Gobot Gobot <gobot@golang.org>
47 lines
1.2 KiB
Go
47 lines
1.2 KiB
Go
// Copyright 2019 The Go Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package cmdtest
|
|
|
|
import (
|
|
"fmt"
|
|
"testing"
|
|
|
|
"golang.org/x/tools/internal/lsp/cmd"
|
|
"golang.org/x/tools/internal/lsp/protocol"
|
|
"golang.org/x/tools/internal/lsp/source"
|
|
"golang.org/x/tools/internal/span"
|
|
)
|
|
|
|
func (r *runner) PrepareRename(t *testing.T, src span.Span, want *source.PrepareItem) {
|
|
m, err := r.data.Mapper(src.URI())
|
|
if err != nil {
|
|
t.Errorf("prepare_rename failed: %v", err)
|
|
}
|
|
|
|
var (
|
|
target = fmt.Sprintf("%v", src)
|
|
args = []string{"prepare_rename", target}
|
|
stdOut, stdErr = r.NormalizeGoplsCmd(t, args...)
|
|
expect string
|
|
)
|
|
|
|
if want.Text == "" {
|
|
if stdErr != "" && stdErr != cmd.ErrInvalidRenamePosition.Error() {
|
|
t.Errorf("prepare_rename failed for %s,\nexpected:\n`%v`\ngot:\n`%v`", target, expect, stdErr)
|
|
}
|
|
return
|
|
}
|
|
|
|
ws, err := m.Span(protocol.Location{Range: want.Range})
|
|
if err != nil {
|
|
t.Errorf("prepare_rename failed: %v", err)
|
|
}
|
|
|
|
expect = r.Normalize(fmt.Sprintln(ws))
|
|
if expect != stdOut {
|
|
t.Errorf("prepare_rename failed for %s expected:\n`%s`\ngot:\n`%s`\n", target, expect, stdOut)
|
|
}
|
|
}
|