Skip to content

Commit

Permalink
tools/gopls: add cmd support for prepare_rename
Browse files Browse the repository at this point in the history
This change adds command line support for prepare_rename.

Updates golang/go#32875

Change-Id: I7f155b9c8329c0faa26a320abab162730a7916ad
GitHub-Last-Rev: 118e846
GitHub-Pull-Request: #188
Reviewed-on: https://go-review.googlesource.com/c/tools/+/207579
Run-TryBot: Rebecca Stambler <rstambler@golang.org>
Reviewed-by: Rebecca Stambler <rstambler@golang.org>
  • Loading branch information
rhnvrm authored and stamblerre committed Feb 4, 2020
1 parent 59e2469 commit 1cc6d1e
Show file tree
Hide file tree
Showing 7 changed files with 134 additions and 7 deletions.
1 change: 1 addition & 0 deletions internal/lsp/cmd/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ func (app *Application) featureCommands() []tool.Application {
&implementation{app: app},
&imports{app: app},
&links{app: app},
&prepareRename{app: app},
&query{app: app},
&references{app: app},
&rename{app: app},
Expand Down
85 changes: 85 additions & 0 deletions internal/lsp/cmd/prepare_rename.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
// 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 cmd

import (
"context"
"flag"
"fmt"

"golang.org/x/tools/internal/lsp/protocol"
"golang.org/x/tools/internal/span"
"golang.org/x/tools/internal/tool"
)

// prepareRename implements the prepare_rename verb for gopls.
type prepareRename struct {
app *Application
}

func (r *prepareRename) Name() string { return "prepare_rename" }
func (r *prepareRename) Usage() string { return "<position>" }
func (r *prepareRename) ShortHelp() string { return "test validity of a rename operation at location" }
func (r *prepareRename) DetailedHelp(f *flag.FlagSet) {
fmt.Fprint(f.Output(), `
Example:
$ # 1-indexed location (:line:column or :#offset) of the target identifier
$ gopls prepare_rename helper/helper.go:8:6
$ gopls prepare_rename helper/helper.go:#53
gopls prepare_rename flags are:
`)
f.PrintDefaults()
}

func (r *prepareRename) Run(ctx context.Context, args ...string) error {
if len(args) != 1 {
return tool.CommandLineErrorf("prepare_rename expects 1 argument (file)")
}

conn, err := r.app.connect(ctx)
if err != nil {
return err
}
defer conn.terminate(ctx)

from := span.Parse(args[0])
file := conn.AddFile(ctx, from.URI())
if file.err != nil {
return file.err
}
loc, err := file.mapper.Location(from)
if err != nil {
return err
}
p := protocol.PrepareRenameParams{
TextDocumentPositionParams: protocol.TextDocumentPositionParams{
TextDocument: protocol.TextDocumentIdentifier{URI: loc.URI},
Position: loc.Range.Start,
},
}
result, err := conn.PrepareRename(ctx, &p)
if err != nil {
return fmt.Errorf("prepare_rename failed: %v", err)
}
if result == nil {
return fmt.Errorf("request is not valid at the given position")
}

resRange, ok := result.(protocol.Range)
if !ok {
return fmt.Errorf("prepare_rename failed to convert result to range, got: %T", result)
}

l := protocol.Location{Range: resRange}
s, err := file.mapper.Span(l)
if err != nil {
return err
}

fmt.Println(s)
return nil
}
4 changes: 0 additions & 4 deletions internal/lsp/cmd/test/cmdtest.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,6 @@ func (r *runner) RankCompletion(t *testing.T, src span.Span, test tests.Completi
//TODO: add command line completions tests when it works
}

func (r *runner) PrepareRename(t *testing.T, src span.Span, want *source.PrepareItem) {
//TODO: add command line prepare rename tests when it works
}

func (r *runner) RunGoplsCmd(t testing.TB, args ...string) (string, string) {
rStdout, wStdout, err := os.Pipe()
if err != nil {
Expand Down
45 changes: 45 additions & 0 deletions internal/lsp/cmd/test/prepare_rename.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
// 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/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 != "" {
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)
}
}
2 changes: 1 addition & 1 deletion internal/lsp/protocol/tsserver.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/lsp/testdata/good/good1.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package good //@diag("package", "no_diagnostics", "")

import (
_ "go/ast" //@prepare("go/ast", "_", "_")
"golang.org/x/tools/internal/lsp/types" //@item(types_import, "types", "\"golang.org/x/tools/internal/lsp/types\"", "package"),prepare("types","\"", "types")
"golang.org/x/tools/internal/lsp/types" //@item(types_import, "types", "\"golang.org/x/tools/internal/lsp/types\"", "package")
)

func random() int { //@item(good_random, "random", "func() int", "func")
Expand Down
2 changes: 1 addition & 1 deletion internal/lsp/testdata/summary.txt.golden
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ TypeDefinitionsCount = 2
HighlightsCount = 52
ReferencesCount = 8
RenamesCount = 23
PrepareRenamesCount = 8
PrepareRenamesCount = 7
SymbolsCount = 1
SignaturesCount = 23
LinksCount = 8
Expand Down

0 comments on commit 1cc6d1e

Please sign in to comment.