qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-18 19:34:41 -07:00
Code Releases Activity

internal/lsp: use span.URI constructor everywhere

Browse Source 
We should never be converting to a URI directly, in case it's encoded or
needs Windows-specific fixes.

Change-Id: I8af272f878e2e4faf428bd7b74b7cba4f65093a3
Reviewed-on: https://go-review.googlesource.com/c/tools/+/217086
Run-TryBot: Heschi Kreinick <heschi@google.com>
Reviewed-by: Rebecca Stambler <rstambler@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Heschi Kreinick 2020-01-30 16:39:33 -05:00 committed by Rebecca Stambler
parent fe90550fed
commit b4207ef493
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/lsp/cmd/cmd.go
View File

@ -368,7 +368,7 @@ func (c *cmdClient) PublishDiagnostics(ctx context.Context, p *protocol.PublishD
c.filesMu.Lock() c.filesMu.Lock()
defer c.filesMu.Unlock() defer c.filesMu.Unlock()
uri := span.URI(p.URI) uri := span.NewURI(p.URI)
file := c.getFile(ctx, uri) file := c.getFile(ctx, uri)
file.diagnostics = p.Diagnostics file.diagnostics = p.Diagnostics
return nil return nil

4
internal/lsp/cmd/rename.go
View File

@ -81,7 +81,7 @@ func (r *rename) Run(ctx context.Context, args ...string) error {
var orderedURIs []string var orderedURIs []string
edits := map[span.URI][]protocol.TextEdit{} edits := map[span.URI][]protocol.TextEdit{}
for _, c := range edit.DocumentChanges { for _, c := range edit.DocumentChanges {
uri := span.URI(c.TextDocument.URI) uri := span.NewURI(c.TextDocument.URI)
edits[uri] = append(edits[uri], c.Edits...) edits[uri] = append(edits[uri], c.Edits...)
orderedURIs = append(orderedURIs, c.TextDocument.URI) orderedURIs = append(orderedURIs, c.TextDocument.URI)
} }
@ -89,7 +89,7 @@ func (r *rename) Run(ctx context.Context, args ...string) error {
changeCount := len(orderedURIs) changeCount := len(orderedURIs)
for _, u := range orderedURIs { for _, u := range orderedURIs {
uri := span.URI(u) uri := span.NewURI(u)
cmdFile := conn.AddFile(ctx, uri) cmdFile := conn.AddFile(ctx, uri)
filename := cmdFile.uri.Filename() filename := cmdFile.uri.Filename()

6
internal/lsp/lsp_test.go
View File

@ -636,7 +636,7 @@ func (r *runner) Rename(t *testing.T, spn span.Span, newText string) {
if i != 0 { if i != 0 {
got += "\n" got += "\n"
} }
uri := span.URI(orderedURIs[i]) uri := span.NewURI(orderedURIs[i])
if len(res) > 1 { if len(res) > 1 {
got += filepath.Base(uri.Filename()) + ":\n" got += filepath.Base(uri.Filename()) + ":\n"
} }
@ -701,7 +701,7 @@ func (r *runner) PrepareRename(t *testing.T, src span.Span, want *source.Prepare
func applyWorkspaceEdits(r *runner, wedit protocol.WorkspaceEdit) (map[span.URI]string, error) { func applyWorkspaceEdits(r *runner, wedit protocol.WorkspaceEdit) (map[span.URI]string, error) {
res := map[span.URI]string{} res := map[span.URI]string{}
for _, docEdits := range wedit.DocumentChanges { for _, docEdits := range wedit.DocumentChanges {
uri := span.URI(docEdits.TextDocument.URI) uri := span.NewURI(docEdits.TextDocument.URI)
m, err := r.data.Mapper(uri) m, err := r.data.Mapper(uri)
if err != nil { if err != nil {
return nil, err return nil, err
@ -1006,7 +1006,7 @@ func TestModfileSuggestedFixes(t *testing.T) {
} }
res := map[span.URI]string{} res := map[span.URI]string{}
for _, docEdits := range actions[0].Edit.DocumentChanges { for _, docEdits := range actions[0].Edit.DocumentChanges {
uri := span.URI(docEdits.TextDocument.URI) uri := span.NewURI(docEdits.TextDocument.URI)
content, err := ioutil.ReadFile(uri.Filename()) content, err := ioutil.ReadFile(uri.Filename())
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)

2
internal/lsp/server.go
View File

@ -115,7 +115,7 @@ func (s *Server) nonstandardRequest(ctx context.Context, method string, params i
paramMap := params.(map[string]interface{}) paramMap := params.(map[string]interface{})
if method == "gopls/diagnoseFiles" { if method == "gopls/diagnoseFiles" {
for _, file := range paramMap["files"].([]interface{}) { for _, file := range paramMap["files"].([]interface{}) {
uri := span.URI(file.(string)) uri := span.NewURI(file.(string))
view, err := s.session.ViewOf(uri) view, err := s.session.ViewOf(uri)
if err != nil { if err != nil {
return nil, err return nil, err