From 4191b8cbba092238a318a71cdff48b20b4e1e5d8 Mon Sep 17 00:00:00 2001 From: Michael Matloob Date: Thu, 14 Nov 2019 15:40:29 -0500 Subject: [PATCH] internal/lsp/testadata/rename: add a test case for renames across packages Renames across packages works as of https://golang.org/cl/206883. Add a test for it. Fixes golang/go#32877 Change-Id: I234fafe95a1060c0ca8d03462bf7b2c241d59e4a Reviewed-on: https://go-review.googlesource.com/c/tools/+/207264 Run-TryBot: Michael Matloob Reviewed-by: Rebecca Stambler --- .../lsp/testdata/rename/crosspkg/crosspkg.go | 7 ++++ .../rename/crosspkg/crosspkg.go.golden | 40 +++++++++++++++++++ .../testdata/rename/crosspkg/other/other.go | 8 ++++ internal/lsp/testdata/summary.txt.golden | 2 +- 4 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 internal/lsp/testdata/rename/crosspkg/crosspkg.go create mode 100644 internal/lsp/testdata/rename/crosspkg/crosspkg.go.golden create mode 100644 internal/lsp/testdata/rename/crosspkg/other/other.go diff --git a/internal/lsp/testdata/rename/crosspkg/crosspkg.go b/internal/lsp/testdata/rename/crosspkg/crosspkg.go new file mode 100644 index 0000000000..8510bcfe05 --- /dev/null +++ b/internal/lsp/testdata/rename/crosspkg/crosspkg.go @@ -0,0 +1,7 @@ +package crosspkg + +func Foo() { //@rename("Foo", "Dolphin") + +} + +var Bar int //@rename("Bar", "Tomato") diff --git a/internal/lsp/testdata/rename/crosspkg/crosspkg.go.golden b/internal/lsp/testdata/rename/crosspkg/crosspkg.go.golden new file mode 100644 index 0000000000..44c6367726 --- /dev/null +++ b/internal/lsp/testdata/rename/crosspkg/crosspkg.go.golden @@ -0,0 +1,40 @@ +-- Dolphin-rename -- +crosspkg.go: +package crosspkg + +func Dolphin() { //@rename("Foo", "Dolphin") + +} + +var Bar int //@rename("Bar", "Tomato") + +other.go: +package other + +import "golang.org/x/tools/internal/lsp/rename/crosspkg" + +func Other() { + crosspkg.Bar + crosspkg.Dolphin() +} + +-- Tomato-rename -- +crosspkg.go: +package crosspkg + +func Foo() { //@rename("Foo", "Dolphin") + +} + +var Tomato int //@rename("Bar", "Tomato") + +other.go: +package other + +import "golang.org/x/tools/internal/lsp/rename/crosspkg" + +func Other() { + crosspkg.Tomato + crosspkg.Foo() +} + diff --git a/internal/lsp/testdata/rename/crosspkg/other/other.go b/internal/lsp/testdata/rename/crosspkg/other/other.go new file mode 100644 index 0000000000..e402854ec2 --- /dev/null +++ b/internal/lsp/testdata/rename/crosspkg/other/other.go @@ -0,0 +1,8 @@ +package other + +import "golang.org/x/tools/internal/lsp/rename/crosspkg" + +func Other() { + crosspkg.Bar + crosspkg.Foo() +} diff --git a/internal/lsp/testdata/summary.txt.golden b/internal/lsp/testdata/summary.txt.golden index ade9cf3d92..19e9ad33cd 100644 --- a/internal/lsp/testdata/summary.txt.golden +++ b/internal/lsp/testdata/summary.txt.golden @@ -15,7 +15,7 @@ DefinitionsCount = 38 TypeDefinitionsCount = 2 HighlightsCount = 2 ReferencesCount = 7 -RenamesCount = 20 +RenamesCount = 22 PrepareRenamesCount = 8 SymbolsCount = 1 SignaturesCount = 21