aboutsummaryrefslogtreecommitdiff
path: root/internal/lsp/testdata/rename
diff options
context:
space:
mode:
Diffstat (limited to 'internal/lsp/testdata/rename')
-rw-r--r--internal/lsp/testdata/rename/a/random.go.golden616
-rw-r--r--internal/lsp/testdata/rename/a/random.go.in42
-rw-r--r--internal/lsp/testdata/rename/b/b.go20
-rw-r--r--internal/lsp/testdata/rename/b/b.go.golden78
-rw-r--r--internal/lsp/testdata/rename/bad/bad.go.golden2
-rw-r--r--internal/lsp/testdata/rename/bad/bad.go.in8
-rw-r--r--internal/lsp/testdata/rename/bad/bad_test.go.in1
-rw-r--r--internal/lsp/testdata/rename/c/c.go7
-rw-r--r--internal/lsp/testdata/rename/c/c.go.golden32
-rw-r--r--internal/lsp/testdata/rename/c/c2.go4
-rw-r--r--internal/lsp/testdata/rename/c/c2.go.golden5
-rw-r--r--internal/lsp/testdata/rename/crosspkg/another/another.go13
-rw-r--r--internal/lsp/testdata/rename/crosspkg/another/another.go.golden15
-rw-r--r--internal/lsp/testdata/rename/crosspkg/crosspkg.go7
-rw-r--r--internal/lsp/testdata/rename/crosspkg/crosspkg.go.golden40
-rw-r--r--internal/lsp/testdata/rename/crosspkg/other/other.go8
-rw-r--r--internal/lsp/testdata/rename/crosspkg/other/other.go.golden20
-rw-r--r--internal/lsp/testdata/rename/generics/embedded.go10
-rw-r--r--internal/lsp/testdata/rename/generics/embedded.go.golden12
-rw-r--r--internal/lsp/testdata/rename/generics/generics.go25
-rw-r--r--internal/lsp/testdata/rename/generics/generics.go.golden108
-rw-r--r--internal/lsp/testdata/rename/generics/unions.go10
-rw-r--r--internal/lsp/testdata/rename/generics/unions.go.golden24
-rw-r--r--internal/lsp/testdata/rename/issue39614/issue39614.go.golden10
-rw-r--r--internal/lsp/testdata/rename/issue39614/issue39614.go.in8
-rw-r--r--internal/lsp/testdata/rename/issue42134/1.go8
-rw-r--r--internal/lsp/testdata/rename/issue42134/1.go.golden10
-rw-r--r--internal/lsp/testdata/rename/issue42134/2.go12
-rw-r--r--internal/lsp/testdata/rename/issue42134/2.go.golden14
-rw-r--r--internal/lsp/testdata/rename/issue42134/3.go11
-rw-r--r--internal/lsp/testdata/rename/issue42134/3.go.golden13
-rw-r--r--internal/lsp/testdata/rename/issue42134/4.go8
-rw-r--r--internal/lsp/testdata/rename/issue42134/4.go.golden10
-rw-r--r--internal/lsp/testdata/rename/issue43616/issue43616.go.golden13
-rw-r--r--internal/lsp/testdata/rename/issue43616/issue43616.go.in7
-rw-r--r--internal/lsp/testdata/rename/shadow/shadow.go20
-rw-r--r--internal/lsp/testdata/rename/shadow/shadow.go.golden48
-rw-r--r--internal/lsp/testdata/rename/testy/testy.go7
-rw-r--r--internal/lsp/testdata/rename/testy/testy.go.golden18
-rw-r--r--internal/lsp/testdata/rename/testy/testy_test.go8
-rw-r--r--internal/lsp/testdata/rename/testy/testy_test.go.golden30
41 files changed, 0 insertions, 1362 deletions
diff --git a/internal/lsp/testdata/rename/a/random.go.golden b/internal/lsp/testdata/rename/a/random.go.golden
deleted file mode 100644
index 7459863ec..000000000
--- a/internal/lsp/testdata/rename/a/random.go.golden
+++ /dev/null
@@ -1,616 +0,0 @@
--- GetSum-rename --
-package a
-
-import (
- lg "log"
- "fmt" //@rename("fmt", "fmty")
- f2 "fmt" //@rename("f2", "f2name"),rename("fmt","f2y")
-)
-
-func Random() int {
- y := 6 + 7
- return y
-}
-
-func Random2(y int) int { //@rename("y", "z")
- return y
-}
-
-type Pos struct {
- x, y int
-}
-
-func (p *Pos) GetSum() int {
- return p.x + p.y //@rename("x", "myX")
-}
-
-func _() {
- var p Pos //@rename("p", "pos")
- _ = p.GetSum() //@rename("Sum", "GetSum")
-}
-
-func sw() {
- var x interface{}
-
- switch y := x.(type) { //@rename("y", "y0")
- case int:
- fmt.Printf("%d", y) //@rename("y", "y1"),rename("fmt", "format")
- case string:
- lg.Printf("%s", y) //@rename("y", "y2"),rename("lg","log")
- default:
- f2.Printf("%v", y) //@rename("y", "y3"),rename("f2","fmt2")
- }
-}
-
--- f2name-rename --
-package a
-
-import (
- lg "log"
- "fmt" //@rename("fmt", "fmty")
- f2name "fmt" //@rename("f2", "f2name"),rename("fmt","f2y")
-)
-
-func Random() int {
- y := 6 + 7
- return y
-}
-
-func Random2(y int) int { //@rename("y", "z")
- return y
-}
-
-type Pos struct {
- x, y int
-}
-
-func (p *Pos) Sum() int {
- return p.x + p.y //@rename("x", "myX")
-}
-
-func _() {
- var p Pos //@rename("p", "pos")
- _ = p.Sum() //@rename("Sum", "GetSum")
-}
-
-func sw() {
- var x interface{}
-
- switch y := x.(type) { //@rename("y", "y0")
- case int:
- fmt.Printf("%d", y) //@rename("y", "y1"),rename("fmt", "format")
- case string:
- lg.Printf("%s", y) //@rename("y", "y2"),rename("lg","log")
- default:
- f2name.Printf("%v", y) //@rename("y", "y3"),rename("f2","fmt2")
- }
-}
-
--- f2y-rename --
-package a
-
-import (
- lg "log"
- "fmt" //@rename("fmt", "fmty")
- f2y "fmt" //@rename("f2", "f2name"),rename("fmt","f2y")
-)
-
-func Random() int {
- y := 6 + 7
- return y
-}
-
-func Random2(y int) int { //@rename("y", "z")
- return y
-}
-
-type Pos struct {
- x, y int
-}
-
-func (p *Pos) Sum() int {
- return p.x + p.y //@rename("x", "myX")
-}
-
-func _() {
- var p Pos //@rename("p", "pos")
- _ = p.Sum() //@rename("Sum", "GetSum")
-}
-
-func sw() {
- var x interface{}
-
- switch y := x.(type) { //@rename("y", "y0")
- case int:
- fmt.Printf("%d", y) //@rename("y", "y1"),rename("fmt", "format")
- case string:
- lg.Printf("%s", y) //@rename("y", "y2"),rename("lg","log")
- default:
- f2y.Printf("%v", y) //@rename("y", "y3"),rename("f2","fmt2")
- }
-}
-
--- fmt2-rename --
-package a
-
-import (
- lg "log"
- "fmt" //@rename("fmt", "fmty")
- fmt2 "fmt" //@rename("f2", "f2name"),rename("fmt","f2y")
-)
-
-func Random() int {
- y := 6 + 7
- return y
-}
-
-func Random2(y int) int { //@rename("y", "z")
- return y
-}
-
-type Pos struct {
- x, y int
-}
-
-func (p *Pos) Sum() int {
- return p.x + p.y //@rename("x", "myX")
-}
-
-func _() {
- var p Pos //@rename("p", "pos")
- _ = p.Sum() //@rename("Sum", "GetSum")
-}
-
-func sw() {
- var x interface{}
-
- switch y := x.(type) { //@rename("y", "y0")
- case int:
- fmt.Printf("%d", y) //@rename("y", "y1"),rename("fmt", "format")
- case string:
- lg.Printf("%s", y) //@rename("y", "y2"),rename("lg","log")
- default:
- fmt2.Printf("%v", y) //@rename("y", "y3"),rename("f2","fmt2")
- }
-}
-
--- fmty-rename --
-package a
-
-import (
- lg "log"
- fmty "fmt" //@rename("fmt", "fmty")
- f2 "fmt" //@rename("f2", "f2name"),rename("fmt","f2y")
-)
-
-func Random() int {
- y := 6 + 7
- return y
-}
-
-func Random2(y int) int { //@rename("y", "z")
- return y
-}
-
-type Pos struct {
- x, y int
-}
-
-func (p *Pos) Sum() int {
- return p.x + p.y //@rename("x", "myX")
-}
-
-func _() {
- var p Pos //@rename("p", "pos")
- _ = p.Sum() //@rename("Sum", "GetSum")
-}
-
-func sw() {
- var x interface{}
-
- switch y := x.(type) { //@rename("y", "y0")
- case int:
- fmty.Printf("%d", y) //@rename("y", "y1"),rename("fmt", "format")
- case string:
- lg.Printf("%s", y) //@rename("y", "y2"),rename("lg","log")
- default:
- f2.Printf("%v", y) //@rename("y", "y3"),rename("f2","fmt2")
- }
-}
-
--- format-rename --
-package a
-
-import (
- lg "log"
- format "fmt" //@rename("fmt", "fmty")
- f2 "fmt" //@rename("f2", "f2name"),rename("fmt","f2y")
-)
-
-func Random() int {
- y := 6 + 7
- return y
-}
-
-func Random2(y int) int { //@rename("y", "z")
- return y
-}
-
-type Pos struct {
- x, y int
-}
-
-func (p *Pos) Sum() int {
- return p.x + p.y //@rename("x", "myX")
-}
-
-func _() {
- var p Pos //@rename("p", "pos")
- _ = p.Sum() //@rename("Sum", "GetSum")
-}
-
-func sw() {
- var x interface{}
-
- switch y := x.(type) { //@rename("y", "y0")
- case int:
- format.Printf("%d", y) //@rename("y", "y1"),rename("fmt", "format")
- case string:
- lg.Printf("%s", y) //@rename("y", "y2"),rename("lg","log")
- default:
- f2.Printf("%v", y) //@rename("y", "y3"),rename("f2","fmt2")
- }
-}
-
--- log-rename --
-package a
-
-import (
- "log"
- "fmt" //@rename("fmt", "fmty")
- f2 "fmt" //@rename("f2", "f2name"),rename("fmt","f2y")
-)
-
-func Random() int {
- y := 6 + 7
- return y
-}
-
-func Random2(y int) int { //@rename("y", "z")
- return y
-}
-
-type Pos struct {
- x, y int
-}
-
-func (p *Pos) Sum() int {
- return p.x + p.y //@rename("x", "myX")
-}
-
-func _() {
- var p Pos //@rename("p", "pos")
- _ = p.Sum() //@rename("Sum", "GetSum")
-}
-
-func sw() {
- var x interface{}
-
- switch y := x.(type) { //@rename("y", "y0")
- case int:
- fmt.Printf("%d", y) //@rename("y", "y1"),rename("fmt", "format")
- case string:
- log.Printf("%s", y) //@rename("y", "y2"),rename("lg","log")
- default:
- f2.Printf("%v", y) //@rename("y", "y3"),rename("f2","fmt2")
- }
-}
-
--- myX-rename --
-package a
-
-import (
- lg "log"
- "fmt" //@rename("fmt", "fmty")
- f2 "fmt" //@rename("f2", "f2name"),rename("fmt","f2y")
-)
-
-func Random() int {
- y := 6 + 7
- return y
-}
-
-func Random2(y int) int { //@rename("y", "z")
- return y
-}
-
-type Pos struct {
- myX, y int
-}
-
-func (p *Pos) Sum() int {
- return p.myX + p.y //@rename("x", "myX")
-}
-
-func _() {
- var p Pos //@rename("p", "pos")
- _ = p.Sum() //@rename("Sum", "GetSum")
-}
-
-func sw() {
- var x interface{}
-
- switch y := x.(type) { //@rename("y", "y0")
- case int:
- fmt.Printf("%d", y) //@rename("y", "y1"),rename("fmt", "format")
- case string:
- lg.Printf("%s", y) //@rename("y", "y2"),rename("lg","log")
- default:
- f2.Printf("%v", y) //@rename("y", "y3"),rename("f2","fmt2")
- }
-}
-
--- pos-rename --
-package a
-
-import (
- lg "log"
- "fmt" //@rename("fmt", "fmty")
- f2 "fmt" //@rename("f2", "f2name"),rename("fmt","f2y")
-)
-
-func Random() int {
- y := 6 + 7
- return y
-}
-
-func Random2(y int) int { //@rename("y", "z")
- return y
-}
-
-type Pos struct {
- x, y int
-}
-
-func (p *Pos) Sum() int {
- return p.x + p.y //@rename("x", "myX")
-}
-
-func _() {
- var pos Pos //@rename("p", "pos")
- _ = pos.Sum() //@rename("Sum", "GetSum")
-}
-
-func sw() {
- var x interface{}
-
- switch y := x.(type) { //@rename("y", "y0")
- case int:
- fmt.Printf("%d", y) //@rename("y", "y1"),rename("fmt", "format")
- case string:
- lg.Printf("%s", y) //@rename("y", "y2"),rename("lg","log")
- default:
- f2.Printf("%v", y) //@rename("y", "y3"),rename("f2","fmt2")
- }
-}
-
--- y0-rename --
-package a
-
-import (
- lg "log"
- "fmt" //@rename("fmt", "fmty")
- f2 "fmt" //@rename("f2", "f2name"),rename("fmt","f2y")
-)
-
-func Random() int {
- y := 6 + 7
- return y
-}
-
-func Random2(y int) int { //@rename("y", "z")
- return y
-}
-
-type Pos struct {
- x, y int
-}
-
-func (p *Pos) Sum() int {
- return p.x + p.y //@rename("x", "myX")
-}
-
-func _() {
- var p Pos //@rename("p", "pos")
- _ = p.Sum() //@rename("Sum", "GetSum")
-}
-
-func sw() {
- var x interface{}
-
- switch y0 := x.(type) { //@rename("y", "y0")
- case int:
- fmt.Printf("%d", y0) //@rename("y", "y1"),rename("fmt", "format")
- case string:
- lg.Printf("%s", y0) //@rename("y", "y2"),rename("lg","log")
- default:
- f2.Printf("%v", y0) //@rename("y", "y3"),rename("f2","fmt2")
- }
-}
-
--- y1-rename --
-package a
-
-import (
- lg "log"
- "fmt" //@rename("fmt", "fmty")
- f2 "fmt" //@rename("f2", "f2name"),rename("fmt","f2y")
-)
-
-func Random() int {
- y := 6 + 7
- return y
-}
-
-func Random2(y int) int { //@rename("y", "z")
- return y
-}
-
-type Pos struct {
- x, y int
-}
-
-func (p *Pos) Sum() int {
- return p.x + p.y //@rename("x", "myX")
-}
-
-func _() {
- var p Pos //@rename("p", "pos")
- _ = p.Sum() //@rename("Sum", "GetSum")
-}
-
-func sw() {
- var x interface{}
-
- switch y1 := x.(type) { //@rename("y", "y0")
- case int:
- fmt.Printf("%d", y1) //@rename("y", "y1"),rename("fmt", "format")
- case string:
- lg.Printf("%s", y1) //@rename("y", "y2"),rename("lg","log")
- default:
- f2.Printf("%v", y1) //@rename("y", "y3"),rename("f2","fmt2")
- }
-}
-
--- y2-rename --
-package a
-
-import (
- lg "log"
- "fmt" //@rename("fmt", "fmty")
- f2 "fmt" //@rename("f2", "f2name"),rename("fmt","f2y")
-)
-
-func Random() int {
- y := 6 + 7
- return y
-}
-
-func Random2(y int) int { //@rename("y", "z")
- return y
-}
-
-type Pos struct {
- x, y int
-}
-
-func (p *Pos) Sum() int {
- return p.x + p.y //@rename("x", "myX")
-}
-
-func _() {
- var p Pos //@rename("p", "pos")
- _ = p.Sum() //@rename("Sum", "GetSum")
-}
-
-func sw() {
- var x interface{}
-
- switch y2 := x.(type) { //@rename("y", "y0")
- case int:
- fmt.Printf("%d", y2) //@rename("y", "y1"),rename("fmt", "format")
- case string:
- lg.Printf("%s", y2) //@rename("y", "y2"),rename("lg","log")
- default:
- f2.Printf("%v", y2) //@rename("y", "y3"),rename("f2","fmt2")
- }
-}
-
--- y3-rename --
-package a
-
-import (
- lg "log"
- "fmt" //@rename("fmt", "fmty")
- f2 "fmt" //@rename("f2", "f2name"),rename("fmt","f2y")
-)
-
-func Random() int {
- y := 6 + 7
- return y
-}
-
-func Random2(y int) int { //@rename("y", "z")
- return y
-}
-
-type Pos struct {
- x, y int
-}
-
-func (p *Pos) Sum() int {
- return p.x + p.y //@rename("x", "myX")
-}
-
-func _() {
- var p Pos //@rename("p", "pos")
- _ = p.Sum() //@rename("Sum", "GetSum")
-}
-
-func sw() {
- var x interface{}
-
- switch y3 := x.(type) { //@rename("y", "y0")
- case int:
- fmt.Printf("%d", y3) //@rename("y", "y1"),rename("fmt", "format")
- case string:
- lg.Printf("%s", y3) //@rename("y", "y2"),rename("lg","log")
- default:
- f2.Printf("%v", y3) //@rename("y", "y3"),rename("f2","fmt2")
- }
-}
-
--- z-rename --
-package a
-
-import (
- lg "log"
- "fmt" //@rename("fmt", "fmty")
- f2 "fmt" //@rename("f2", "f2name"),rename("fmt","f2y")
-)
-
-func Random() int {
- y := 6 + 7
- return y
-}
-
-func Random2(z int) int { //@rename("y", "z")
- return z
-}
-
-type Pos struct {
- x, y int
-}
-
-func (p *Pos) Sum() int {
- return p.x + p.y //@rename("x", "myX")
-}
-
-func _() {
- var p Pos //@rename("p", "pos")
- _ = p.Sum() //@rename("Sum", "GetSum")
-}
-
-func sw() {
- var x interface{}
-
- switch y := x.(type) { //@rename("y", "y0")
- case int:
- fmt.Printf("%d", y) //@rename("y", "y1"),rename("fmt", "format")
- case string:
- lg.Printf("%s", y) //@rename("y", "y2"),rename("lg","log")
- default:
- f2.Printf("%v", y) //@rename("y", "y3"),rename("f2","fmt2")
- }
-}
-
diff --git a/internal/lsp/testdata/rename/a/random.go.in b/internal/lsp/testdata/rename/a/random.go.in
deleted file mode 100644
index 069db27ba..000000000
--- a/internal/lsp/testdata/rename/a/random.go.in
+++ /dev/null
@@ -1,42 +0,0 @@
-package a
-
-import (
- lg "log"
- "fmt" //@rename("fmt", "fmty")
- f2 "fmt" //@rename("f2", "f2name"),rename("fmt","f2y")
-)
-
-func Random() int {
- y := 6 + 7
- return y
-}
-
-func Random2(y int) int { //@rename("y", "z")
- return y
-}
-
-type Pos struct {
- x, y int
-}
-
-func (p *Pos) Sum() int {
- return p.x + p.y //@rename("x", "myX")
-}
-
-func _() {
- var p Pos //@rename("p", "pos")
- _ = p.Sum() //@rename("Sum", "GetSum")
-}
-
-func sw() {
- var x interface{}
-
- switch y := x.(type) { //@rename("y", "y0")
- case int:
- fmt.Printf("%d", y) //@rename("y", "y1"),rename("fmt", "format")
- case string:
- lg.Printf("%s", y) //@rename("y", "y2"),rename("lg","log")
- default:
- f2.Printf("%v", y) //@rename("y", "y3"),rename("f2","fmt2")
- }
-}
diff --git a/internal/lsp/testdata/rename/b/b.go b/internal/lsp/testdata/rename/b/b.go
deleted file mode 100644
index 8455f035b..000000000
--- a/internal/lsp/testdata/rename/b/b.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package b
-
-var c int //@rename("int", "uint")
-
-func _() {
- a := 1 //@rename("a", "error")
- a = 2
- _ = a
-}
-
-var (
- // Hello there.
- // Foo does the thing.
- Foo int //@rename("Foo", "Bob")
-)
-
-/*
-Hello description
-*/
-func Hello() {} //@rename("Hello", "Goodbye")
diff --git a/internal/lsp/testdata/rename/b/b.go.golden b/internal/lsp/testdata/rename/b/b.go.golden
deleted file mode 100644
index 9cdc5677f..000000000
--- a/internal/lsp/testdata/rename/b/b.go.golden
+++ /dev/null
@@ -1,78 +0,0 @@
--- Bob-rename --
-package b
-
-var c int //@rename("int", "uint")
-
-func _() {
- a := 1 //@rename("a", "error")
- a = 2
- _ = a
-}
-
-var (
- // Hello there.
- // Bob does the thing.
- Bob int //@rename("Foo", "Bob")
-)
-
-/*
-Hello description
-*/
-func Hello() {} //@rename("Hello", "Goodbye")
-
--- Goodbye-rename --
-b.go:
-package b
-
-var c int //@rename("int", "uint")
-
-func _() {
- a := 1 //@rename("a", "error")
- a = 2
- _ = a
-}
-
-var (
- // Hello there.
- // Foo does the thing.
- Foo int //@rename("Foo", "Bob")
-)
-
-/*
-Goodbye description
-*/
-func Goodbye() {} //@rename("Hello", "Goodbye")
-
-c.go:
-package c
-
-import "golang.org/x/tools/internal/lsp/rename/b"
-
-func _() {
- b.Goodbye() //@rename("Hello", "Goodbye")
-}
-
--- error-rename --
-package b
-
-var c int //@rename("int", "uint")
-
-func _() {
- error := 1 //@rename("a", "error")
- error = 2
- _ = error
-}
-
-var (
- // Hello there.
- // Foo does the thing.
- Foo int //@rename("Foo", "Bob")
-)
-
-/*
-Hello description
-*/
-func Hello() {} //@rename("Hello", "Goodbye")
-
--- uint-rename --
-"int": builtin object
diff --git a/internal/lsp/testdata/rename/bad/bad.go.golden b/internal/lsp/testdata/rename/bad/bad.go.golden
deleted file mode 100644
index 7f4581392..000000000
--- a/internal/lsp/testdata/rename/bad/bad.go.golden
+++ /dev/null
@@ -1,2 +0,0 @@
--- rFunc-rename --
-renaming "sFunc" to "rFunc" not possible because "golang.org/x/tools/internal/lsp/rename/bad" has errors
diff --git a/internal/lsp/testdata/rename/bad/bad.go.in b/internal/lsp/testdata/rename/bad/bad.go.in
deleted file mode 100644
index 56dbee74e..000000000
--- a/internal/lsp/testdata/rename/bad/bad.go.in
+++ /dev/null
@@ -1,8 +0,0 @@
-package bad
-
-type myStruct struct {
-}
-
-func (s *myStruct) sFunc() bool { //@rename("sFunc", "rFunc")
- return s.Bad
-}
diff --git a/internal/lsp/testdata/rename/bad/bad_test.go.in b/internal/lsp/testdata/rename/bad/bad_test.go.in
deleted file mode 100644
index e695db14b..000000000
--- a/internal/lsp/testdata/rename/bad/bad_test.go.in
+++ /dev/null
@@ -1 +0,0 @@
-package bad \ No newline at end of file
diff --git a/internal/lsp/testdata/rename/c/c.go b/internal/lsp/testdata/rename/c/c.go
deleted file mode 100644
index 519d2f6fc..000000000
--- a/internal/lsp/testdata/rename/c/c.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package c
-
-import "golang.org/x/tools/internal/lsp/rename/b"
-
-func _() {
- b.Hello() //@rename("Hello", "Goodbye")
-}
diff --git a/internal/lsp/testdata/rename/c/c.go.golden b/internal/lsp/testdata/rename/c/c.go.golden
deleted file mode 100644
index 56937420c..000000000
--- a/internal/lsp/testdata/rename/c/c.go.golden
+++ /dev/null
@@ -1,32 +0,0 @@
--- Goodbye-rename --
-b.go:
-package b
-
-var c int //@rename("int", "uint")
-
-func _() {
- a := 1 //@rename("a", "error")
- a = 2
- _ = a
-}
-
-var (
- // Hello there.
- // Foo does the thing.
- Foo int //@rename("Foo", "Bob")
-)
-
-/*
-Goodbye description
-*/
-func Goodbye() {} //@rename("Hello", "Goodbye")
-
-c.go:
-package c
-
-import "golang.org/x/tools/internal/lsp/rename/b"
-
-func _() {
- b.Goodbye() //@rename("Hello", "Goodbye")
-}
-
diff --git a/internal/lsp/testdata/rename/c/c2.go b/internal/lsp/testdata/rename/c/c2.go
deleted file mode 100644
index 4fc484a1a..000000000
--- a/internal/lsp/testdata/rename/c/c2.go
+++ /dev/null
@@ -1,4 +0,0 @@
-package c
-
-//go:embed Static/*
-var Static embed.FS //@rename("Static", "static") \ No newline at end of file
diff --git a/internal/lsp/testdata/rename/c/c2.go.golden b/internal/lsp/testdata/rename/c/c2.go.golden
deleted file mode 100644
index e509227a9..000000000
--- a/internal/lsp/testdata/rename/c/c2.go.golden
+++ /dev/null
@@ -1,5 +0,0 @@
--- static-rename --
-package c
-
-//go:embed Static/*
-var static embed.FS //@rename("Static", "static")
diff --git a/internal/lsp/testdata/rename/crosspkg/another/another.go b/internal/lsp/testdata/rename/crosspkg/another/another.go
deleted file mode 100644
index 9b50af2cb..000000000
--- a/internal/lsp/testdata/rename/crosspkg/another/another.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package another
-
-type (
- I interface{ F() }
- C struct{ I }
-)
-
-func (C) g()
-
-func _() {
- var x I = C{}
- x.F() //@rename("F", "G")
-}
diff --git a/internal/lsp/testdata/rename/crosspkg/another/another.go.golden b/internal/lsp/testdata/rename/crosspkg/another/another.go.golden
deleted file mode 100644
index d3fccdaf1..000000000
--- a/internal/lsp/testdata/rename/crosspkg/another/another.go.golden
+++ /dev/null
@@ -1,15 +0,0 @@
--- G-rename --
-package another
-
-type (
- I interface{ G() }
- C struct{ I }
-)
-
-func (C) g()
-
-func _() {
- var x I = C{}
- x.G() //@rename("F", "G")
-}
-
diff --git a/internal/lsp/testdata/rename/crosspkg/crosspkg.go b/internal/lsp/testdata/rename/crosspkg/crosspkg.go
deleted file mode 100644
index 8510bcfe0..000000000
--- a/internal/lsp/testdata/rename/crosspkg/crosspkg.go
+++ /dev/null
@@ -1,7 +0,0 @@
-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
deleted file mode 100644
index 810926de6..000000000
--- a/internal/lsp/testdata/rename/crosspkg/crosspkg.go.golden
+++ /dev/null
@@ -1,40 +0,0 @@
--- 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() //@rename("Foo", "Flamingo")
-}
-
--- 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() //@rename("Foo", "Flamingo")
-}
-
diff --git a/internal/lsp/testdata/rename/crosspkg/other/other.go b/internal/lsp/testdata/rename/crosspkg/other/other.go
deleted file mode 100644
index 10d17cd34..000000000
--- a/internal/lsp/testdata/rename/crosspkg/other/other.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package other
-
-import "golang.org/x/tools/internal/lsp/rename/crosspkg"
-
-func Other() {
- crosspkg.Bar
- crosspkg.Foo() //@rename("Foo", "Flamingo")
-}
diff --git a/internal/lsp/testdata/rename/crosspkg/other/other.go.golden b/internal/lsp/testdata/rename/crosspkg/other/other.go.golden
deleted file mode 100644
index 2722ad96e..000000000
--- a/internal/lsp/testdata/rename/crosspkg/other/other.go.golden
+++ /dev/null
@@ -1,20 +0,0 @@
--- Flamingo-rename --
-crosspkg.go:
-package crosspkg
-
-func Flamingo() { //@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.Flamingo() //@rename("Foo", "Flamingo")
-}
-
diff --git a/internal/lsp/testdata/rename/generics/embedded.go b/internal/lsp/testdata/rename/generics/embedded.go
deleted file mode 100644
index b44bab880..000000000
--- a/internal/lsp/testdata/rename/generics/embedded.go
+++ /dev/null
@@ -1,10 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-package generics
-
-type foo[P any] int //@rename("foo","bar")
-
-var x struct{ foo[int] }
-
-var _ = x.foo
diff --git a/internal/lsp/testdata/rename/generics/embedded.go.golden b/internal/lsp/testdata/rename/generics/embedded.go.golden
deleted file mode 100644
index faa9afb69..000000000
--- a/internal/lsp/testdata/rename/generics/embedded.go.golden
+++ /dev/null
@@ -1,12 +0,0 @@
--- bar-rename --
-//go:build go1.18
-// +build go1.18
-
-package generics
-
-type bar[P any] int //@rename("foo","bar")
-
-var x struct{ bar[int] }
-
-var _ = x.bar
-
diff --git a/internal/lsp/testdata/rename/generics/generics.go b/internal/lsp/testdata/rename/generics/generics.go
deleted file mode 100644
index 977589c0c..000000000
--- a/internal/lsp/testdata/rename/generics/generics.go
+++ /dev/null
@@ -1,25 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-package generics
-
-type G[P any] struct {
- F int
-}
-
-func (G[_]) M() {}
-
-func F[P any](P) {
- var p P //@rename("P", "Q")
- _ = p
-}
-
-func _() {
- var x G[int] //@rename("G", "H")
- _ = x.F //@rename("F", "K")
- x.M() //@rename("M", "N")
-
- var y G[string]
- _ = y.F
- y.M()
-}
diff --git a/internal/lsp/testdata/rename/generics/generics.go.golden b/internal/lsp/testdata/rename/generics/generics.go.golden
deleted file mode 100644
index 7d39813e1..000000000
--- a/internal/lsp/testdata/rename/generics/generics.go.golden
+++ /dev/null
@@ -1,108 +0,0 @@
--- H-rename --
-//go:build go1.18
-// +build go1.18
-
-package generics
-
-type H[P any] struct {
- F int
-}
-
-func (H[_]) M() {}
-
-func F[P any](P) {
- var p P //@rename("P", "Q")
- _ = p
-}
-
-func _() {
- var x H[int] //@rename("G", "H")
- _ = x.F //@rename("F", "K")
- x.M() //@rename("M", "N")
-
- var y H[string]
- _ = y.F
- y.M()
-}
-
--- K-rename --
-//go:build go1.18
-// +build go1.18
-
-package generics
-
-type G[P any] struct {
- K int
-}
-
-func (G[_]) M() {}
-
-func F[P any](P) {
- var p P //@rename("P", "Q")
- _ = p
-}
-
-func _() {
- var x G[int] //@rename("G", "H")
- _ = x.K //@rename("F", "K")
- x.M() //@rename("M", "N")
-
- var y G[string]
- _ = y.K
- y.M()
-}
-
--- N-rename --
-//go:build go1.18
-// +build go1.18
-
-package generics
-
-type G[P any] struct {
- F int
-}
-
-func (G[_]) N() {}
-
-func F[P any](P) {
- var p P //@rename("P", "Q")
- _ = p
-}
-
-func _() {
- var x G[int] //@rename("G", "H")
- _ = x.F //@rename("F", "K")
- x.N() //@rename("M", "N")
-
- var y G[string]
- _ = y.F
- y.N()
-}
-
--- Q-rename --
-//go:build go1.18
-// +build go1.18
-
-package generics
-
-type G[P any] struct {
- F int
-}
-
-func (G[_]) M() {}
-
-func F[Q any](Q) {
- var p Q //@rename("P", "Q")
- _ = p
-}
-
-func _() {
- var x G[int] //@rename("G", "H")
- _ = x.F //@rename("F", "K")
- x.M() //@rename("M", "N")
-
- var y G[string]
- _ = y.F
- y.M()
-}
-
diff --git a/internal/lsp/testdata/rename/generics/unions.go b/internal/lsp/testdata/rename/generics/unions.go
deleted file mode 100644
index c737b5c27..000000000
--- a/internal/lsp/testdata/rename/generics/unions.go
+++ /dev/null
@@ -1,10 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-package generics
-
-type T string //@rename("T", "R")
-
-type C interface {
- T | ~int //@rename("T", "S")
-}
diff --git a/internal/lsp/testdata/rename/generics/unions.go.golden b/internal/lsp/testdata/rename/generics/unions.go.golden
deleted file mode 100644
index 463289629..000000000
--- a/internal/lsp/testdata/rename/generics/unions.go.golden
+++ /dev/null
@@ -1,24 +0,0 @@
--- R-rename --
-//go:build go1.18
-// +build go1.18
-
-package generics
-
-type R string //@rename("T", "R")
-
-type C interface {
- R | ~int //@rename("T", "S")
-}
-
--- S-rename --
-//go:build go1.18
-// +build go1.18
-
-package generics
-
-type S string //@rename("T", "R")
-
-type C interface {
- S | ~int //@rename("T", "S")
-}
-
diff --git a/internal/lsp/testdata/rename/issue39614/issue39614.go.golden b/internal/lsp/testdata/rename/issue39614/issue39614.go.golden
deleted file mode 100644
index d87c58e83..000000000
--- a/internal/lsp/testdata/rename/issue39614/issue39614.go.golden
+++ /dev/null
@@ -1,10 +0,0 @@
--- bar-rename --
-package issue39614
-
-func fn() {
- var bar bool //@rename("foo","bar")
- make(map[string]bool
- if true {
- }
-}
-
diff --git a/internal/lsp/testdata/rename/issue39614/issue39614.go.in b/internal/lsp/testdata/rename/issue39614/issue39614.go.in
deleted file mode 100644
index 8222db2c4..000000000
--- a/internal/lsp/testdata/rename/issue39614/issue39614.go.in
+++ /dev/null
@@ -1,8 +0,0 @@
-package issue39614
-
-func fn() {
- var foo bool //@rename("foo","bar")
- make(map[string]bool
- if true {
- }
-}
diff --git a/internal/lsp/testdata/rename/issue42134/1.go b/internal/lsp/testdata/rename/issue42134/1.go
deleted file mode 100644
index 056f8476a..000000000
--- a/internal/lsp/testdata/rename/issue42134/1.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package issue42134
-
-func _() {
- // foo computes things.
- foo := func() {}
-
- foo() //@rename("foo", "bar")
-}
diff --git a/internal/lsp/testdata/rename/issue42134/1.go.golden b/internal/lsp/testdata/rename/issue42134/1.go.golden
deleted file mode 100644
index 266aeef4b..000000000
--- a/internal/lsp/testdata/rename/issue42134/1.go.golden
+++ /dev/null
@@ -1,10 +0,0 @@
--- bar-rename --
-package issue42134
-
-func _() {
- // bar computes things.
- bar := func() {}
-
- bar() //@rename("foo", "bar")
-}
-
diff --git a/internal/lsp/testdata/rename/issue42134/2.go b/internal/lsp/testdata/rename/issue42134/2.go
deleted file mode 100644
index e9f639575..000000000
--- a/internal/lsp/testdata/rename/issue42134/2.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package issue42134
-
-import "fmt"
-
-func _() {
- // minNumber is a min number.
- // Second line.
- minNumber := min(1, 2)
- fmt.Println(minNumber) //@rename("minNumber", "res")
-}
-
-func min(a, b int) int { return a }
diff --git a/internal/lsp/testdata/rename/issue42134/2.go.golden b/internal/lsp/testdata/rename/issue42134/2.go.golden
deleted file mode 100644
index 406a3833c..000000000
--- a/internal/lsp/testdata/rename/issue42134/2.go.golden
+++ /dev/null
@@ -1,14 +0,0 @@
--- res-rename --
-package issue42134
-
-import "fmt"
-
-func _() {
- // res is a min number.
- // Second line.
- res := min(1, 2)
- fmt.Println(res) //@rename("minNumber", "res")
-}
-
-func min(a, b int) int { return a }
-
diff --git a/internal/lsp/testdata/rename/issue42134/3.go b/internal/lsp/testdata/rename/issue42134/3.go
deleted file mode 100644
index 7666f57d3..000000000
--- a/internal/lsp/testdata/rename/issue42134/3.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package issue42134
-
-func _() {
- /*
- tests contains test cases
- */
- tests := []struct { //@rename("tests", "testCases")
- in, out string
- }{}
- _ = tests
-}
diff --git a/internal/lsp/testdata/rename/issue42134/3.go.golden b/internal/lsp/testdata/rename/issue42134/3.go.golden
deleted file mode 100644
index cdcae1808..000000000
--- a/internal/lsp/testdata/rename/issue42134/3.go.golden
+++ /dev/null
@@ -1,13 +0,0 @@
--- testCases-rename --
-package issue42134
-
-func _() {
- /*
- testCases contains test cases
- */
- testCases := []struct { //@rename("tests", "testCases")
- in, out string
- }{}
- _ = testCases
-}
-
diff --git a/internal/lsp/testdata/rename/issue42134/4.go b/internal/lsp/testdata/rename/issue42134/4.go
deleted file mode 100644
index c953520bc..000000000
--- a/internal/lsp/testdata/rename/issue42134/4.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package issue42134
-
-func _() {
- // a is equal to 5. Comment must stay the same
-
- a := 5
- _ = a //@rename("a", "b")
-}
diff --git a/internal/lsp/testdata/rename/issue42134/4.go.golden b/internal/lsp/testdata/rename/issue42134/4.go.golden
deleted file mode 100644
index 2086cf74c..000000000
--- a/internal/lsp/testdata/rename/issue42134/4.go.golden
+++ /dev/null
@@ -1,10 +0,0 @@
--- b-rename --
-package issue42134
-
-func _() {
- // a is equal to 5. Comment must stay the same
-
- b := 5
- _ = b //@rename("a", "b")
-}
-
diff --git a/internal/lsp/testdata/rename/issue43616/issue43616.go.golden b/internal/lsp/testdata/rename/issue43616/issue43616.go.golden
deleted file mode 100644
index 34d03ba7a..000000000
--- a/internal/lsp/testdata/rename/issue43616/issue43616.go.golden
+++ /dev/null
@@ -1,13 +0,0 @@
--- bar-rename --
-package issue43616
-
-type bar int //@rename("foo","bar"),prepare("oo","foo","foo")
-
-var x struct{ bar } //@rename("foo","baz")
-
-var _ = x.bar //@rename("foo","quux")
-
--- baz-rename --
-can't rename embedded fields: rename the type directly or name the field
--- quux-rename --
-can't rename embedded fields: rename the type directly or name the field
diff --git a/internal/lsp/testdata/rename/issue43616/issue43616.go.in b/internal/lsp/testdata/rename/issue43616/issue43616.go.in
deleted file mode 100644
index aaad531b7..000000000
--- a/internal/lsp/testdata/rename/issue43616/issue43616.go.in
+++ /dev/null
@@ -1,7 +0,0 @@
-package issue43616
-
-type foo int //@rename("foo","bar"),prepare("oo","foo","foo")
-
-var x struct{ foo } //@rename("foo","baz")
-
-var _ = x.foo //@rename("foo","quux")
diff --git a/internal/lsp/testdata/rename/shadow/shadow.go b/internal/lsp/testdata/rename/shadow/shadow.go
deleted file mode 100644
index 38329b4fe..000000000
--- a/internal/lsp/testdata/rename/shadow/shadow.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package shadow
-
-func _() {
- a := true
- b, c, _ := A(), B(), D() //@rename("A", "a"),rename("B", "b"),rename("b", "c"),rename("D", "d")
- d := false
- _, _, _, _ = a, b, c, d
-}
-
-func A() int {
- return 0
-}
-
-func B() int {
- return 0
-}
-
-func D() int {
- return 0
-}
diff --git a/internal/lsp/testdata/rename/shadow/shadow.go.golden b/internal/lsp/testdata/rename/shadow/shadow.go.golden
deleted file mode 100644
index 6281bcdd9..000000000
--- a/internal/lsp/testdata/rename/shadow/shadow.go.golden
+++ /dev/null
@@ -1,48 +0,0 @@
--- a-rename --
-renaming this func "A" to "a" would cause this reference to become shadowed by this intervening var definition
--- b-rename --
-package shadow
-
-func _() {
- a := true
- b, c, _ := A(), b(), D() //@rename("A", "a"),rename("B", "b"),rename("b", "c"),rename("D", "d")
- d := false
- _, _, _, _ = a, b, c, d
-}
-
-func A() int {
- return 0
-}
-
-func b() int {
- return 0
-}
-
-func D() int {
- return 0
-}
-
--- c-rename --
-renaming this var "b" to "c" conflicts with var in same block
--- d-rename --
-package shadow
-
-func _() {
- a := true
- b, c, _ := A(), B(), d() //@rename("A", "a"),rename("B", "b"),rename("b", "c"),rename("D", "d")
- d := false
- _, _, _, _ = a, b, c, d
-}
-
-func A() int {
- return 0
-}
-
-func B() int {
- return 0
-}
-
-func d() int {
- return 0
-}
-
diff --git a/internal/lsp/testdata/rename/testy/testy.go b/internal/lsp/testdata/rename/testy/testy.go
deleted file mode 100644
index e46dc06cd..000000000
--- a/internal/lsp/testdata/rename/testy/testy.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package testy
-
-type tt int //@rename("tt", "testyType")
-
-func a() {
- foo := 42 //@rename("foo", "bar")
-}
diff --git a/internal/lsp/testdata/rename/testy/testy.go.golden b/internal/lsp/testdata/rename/testy/testy.go.golden
deleted file mode 100644
index 288dfee96..000000000
--- a/internal/lsp/testdata/rename/testy/testy.go.golden
+++ /dev/null
@@ -1,18 +0,0 @@
--- bar-rename --
-package testy
-
-type tt int //@rename("tt", "testyType")
-
-func a() {
- bar := 42 //@rename("foo", "bar")
-}
-
--- testyType-rename --
-package testy
-
-type testyType int //@rename("tt", "testyType")
-
-func a() {
- foo := 42 //@rename("foo", "bar")
-}
-
diff --git a/internal/lsp/testdata/rename/testy/testy_test.go b/internal/lsp/testdata/rename/testy/testy_test.go
deleted file mode 100644
index 3d86e8455..000000000
--- a/internal/lsp/testdata/rename/testy/testy_test.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package testy
-
-import "testing"
-
-func TestSomething(t *testing.T) {
- var x int //@rename("x", "testyX")
- a() //@rename("a", "b")
-}
diff --git a/internal/lsp/testdata/rename/testy/testy_test.go.golden b/internal/lsp/testdata/rename/testy/testy_test.go.golden
deleted file mode 100644
index 480c8e995..000000000
--- a/internal/lsp/testdata/rename/testy/testy_test.go.golden
+++ /dev/null
@@ -1,30 +0,0 @@
--- b-rename --
-testy.go:
-package testy
-
-type tt int //@rename("tt", "testyType")
-
-func b() {
- foo := 42 //@rename("foo", "bar")
-}
-
-testy_test.go:
-package testy
-
-import "testing"
-
-func TestSomething(t *testing.T) {
- var x int //@rename("x", "testyX")
- b() //@rename("a", "b")
-}
-
--- testyX-rename --
-package testy
-
-import "testing"
-
-func TestSomething(t *testing.T) {
- var testyX int //@rename("x", "testyX")
- a() //@rename("a", "b")
-}
-