diff options
Diffstat (limited to 'internal/lsp/testdata/extract')
42 files changed, 0 insertions, 1438 deletions
diff --git a/internal/lsp/testdata/extract/extract_function/extract_args_returns.go b/internal/lsp/testdata/extract/extract_function/extract_args_returns.go deleted file mode 100644 index 63d24df00..000000000 --- a/internal/lsp/testdata/extract/extract_function/extract_args_returns.go +++ /dev/null @@ -1,11 +0,0 @@ -package extract - -func _() { - a := 1 - a = 5 //@mark(exSt0, "a") - a = a + 2 //@mark(exEn0, "2") - //@extractfunc(exSt0, exEn0) - b := a * 2 //@mark(exB, " b") - _ = 3 + 4 //@mark(exEnd, "4") - //@extractfunc(exB, exEnd) -} diff --git a/internal/lsp/testdata/extract/extract_function/extract_args_returns.go.golden b/internal/lsp/testdata/extract/extract_function/extract_args_returns.go.golden deleted file mode 100644 index b15345e23..000000000 --- a/internal/lsp/testdata/extract/extract_function/extract_args_returns.go.golden +++ /dev/null @@ -1,37 +0,0 @@ --- functionextraction_extract_args_returns_5_2 -- -package extract - -func _() { - a := 1 - //@mark(exSt0, "a") - a = newFunction(a) //@mark(exEn0, "2") - //@extractfunc(exSt0, exEn0) - b := a * 2 //@mark(exB, " b") - _ = 3 + 4 //@mark(exEnd, "4") - //@extractfunc(exB, exEnd) -} - -func newFunction(a int) int { - a = 5 - a = a + 2 - return a -} - --- functionextraction_extract_args_returns_8_1 -- -package extract - -func _() { - a := 1 - a = 5 //@mark(exSt0, "a") - a = a + 2 //@mark(exEn0, "2") - //@extractfunc(exSt0, exEn0) - //@mark(exB, " b") - newFunction(a) //@mark(exEnd, "4") - //@extractfunc(exB, exEnd) -} - -func newFunction(a int) { - b := a * 2 - _ = 3 + 4 -} - diff --git a/internal/lsp/testdata/extract/extract_function/extract_basic.go b/internal/lsp/testdata/extract/extract_function/extract_basic.go deleted file mode 100644 index 5e44de26f..000000000 --- a/internal/lsp/testdata/extract/extract_function/extract_basic.go +++ /dev/null @@ -1,8 +0,0 @@ -package extract - -func _() { //@mark(exSt25, "{") - a := 1 //@mark(exSt1, "a") - _ = 3 + 4 //@mark(exEn1, "4") - //@extractfunc(exSt1, exEn1) - //@extractfunc(exSt25, exEn25) -} //@mark(exEn25, "}") diff --git a/internal/lsp/testdata/extract/extract_function/extract_basic.go.golden b/internal/lsp/testdata/extract/extract_function/extract_basic.go.golden deleted file mode 100644 index 18adc4db4..000000000 --- a/internal/lsp/testdata/extract/extract_function/extract_basic.go.golden +++ /dev/null @@ -1,30 +0,0 @@ --- functionextraction_extract_basic_3_10 -- -package extract - -func _() { //@mark(exSt25, "{") - //@mark(exSt1, "a") - newFunction() //@mark(exEn1, "4") - //@extractfunc(exSt1, exEn1) - //@extractfunc(exSt25, exEn25) -} - -func newFunction() { - a := 1 - _ = 3 + 4 -} //@mark(exEn25, "}") - --- functionextraction_extract_basic_4_2 -- -package extract - -func _() { //@mark(exSt25, "{") - //@mark(exSt1, "a") - newFunction() //@mark(exEn1, "4") - //@extractfunc(exSt1, exEn1) - //@extractfunc(exSt25, exEn25) -} - -func newFunction() { - a := 1 - _ = 3 + 4 -} //@mark(exEn25, "}") - diff --git a/internal/lsp/testdata/extract/extract_function/extract_basic_comment.go b/internal/lsp/testdata/extract/extract_function/extract_basic_comment.go deleted file mode 100644 index 4e2b12fbc..000000000 --- a/internal/lsp/testdata/extract/extract_function/extract_basic_comment.go +++ /dev/null @@ -1,8 +0,0 @@ -package extract - -func _() { - a := /* comment in the middle of a line */ 1 //@mark(exSt18, "a") - // Comment on its own line - _ = 3 + 4 //@mark(exEn18, "4") - //@extractfunc(exSt18, exEn18) -} diff --git a/internal/lsp/testdata/extract/extract_function/extract_basic_comment.go.golden b/internal/lsp/testdata/extract/extract_function/extract_basic_comment.go.golden deleted file mode 100644 index a43822a90..000000000 --- a/internal/lsp/testdata/extract/extract_function/extract_basic_comment.go.golden +++ /dev/null @@ -1,17 +0,0 @@ --- functionextraction_extract_basic_comment_4_2 -- -package extract - -func _() { - /* comment in the middle of a line */ - //@mark(exSt18, "a") - // Comment on its own line - newFunction() //@mark(exEn18, "4") - //@extractfunc(exSt18, exEn18) -} - -func newFunction() { - a := 1 - - _ = 3 + 4 -} - diff --git a/internal/lsp/testdata/extract/extract_function/extract_issue_44813.go b/internal/lsp/testdata/extract/extract_function/extract_issue_44813.go deleted file mode 100644 index 9713b9101..000000000 --- a/internal/lsp/testdata/extract/extract_function/extract_issue_44813.go +++ /dev/null @@ -1,13 +0,0 @@ -package extract - -import "fmt" - -func main() { - x := []rune{} //@mark(exSt9, "x") - s := "HELLO" - for _, c := range s { - x = append(x, c) - } //@mark(exEn9, "}") - //@extractfunc(exSt9, exEn9) - fmt.Printf("%x\n", x) -} diff --git a/internal/lsp/testdata/extract/extract_function/extract_issue_44813.go.golden b/internal/lsp/testdata/extract/extract_function/extract_issue_44813.go.golden deleted file mode 100644 index 3198c9fa2..000000000 --- a/internal/lsp/testdata/extract/extract_function/extract_issue_44813.go.golden +++ /dev/null @@ -1,21 +0,0 @@ --- functionextraction_extract_issue_44813_6_2 -- -package extract - -import "fmt" - -func main() { - //@mark(exSt9, "x") - x := newFunction() //@mark(exEn9, "}") - //@extractfunc(exSt9, exEn9) - fmt.Printf("%x\n", x) -} - -func newFunction() []rune { - x := []rune{} - s := "HELLO" - for _, c := range s { - x = append(x, c) - } - return x -} - diff --git a/internal/lsp/testdata/extract/extract_function/extract_redefine.go b/internal/lsp/testdata/extract/extract_function/extract_redefine.go deleted file mode 100644 index 604f4757c..000000000 --- a/internal/lsp/testdata/extract/extract_function/extract_redefine.go +++ /dev/null @@ -1,11 +0,0 @@ -package extract - -import "strconv" - -func _() { - i, err := strconv.Atoi("1") - u, err := strconv.Atoi("2") //@extractfunc("u", ")") - if i == u || err == nil { - return - } -} diff --git a/internal/lsp/testdata/extract/extract_function/extract_redefine.go.golden b/internal/lsp/testdata/extract/extract_function/extract_redefine.go.golden deleted file mode 100644 index e2ee217d1..000000000 --- a/internal/lsp/testdata/extract/extract_function/extract_redefine.go.golden +++ /dev/null @@ -1,18 +0,0 @@ --- functionextraction_extract_redefine_7_2 -- -package extract - -import "strconv" - -func _() { - i, err := strconv.Atoi("1") - u, err := newFunction() //@extractfunc("u", ")") - if i == u || err == nil { - return - } -} - -func newFunction() (int, error) { - u, err := strconv.Atoi("2") - return u, err -} - diff --git a/internal/lsp/testdata/extract/extract_function/extract_return_basic.go b/internal/lsp/testdata/extract/extract_function/extract_return_basic.go deleted file mode 100644 index 1ff24daeb..000000000 --- a/internal/lsp/testdata/extract/extract_function/extract_return_basic.go +++ /dev/null @@ -1,10 +0,0 @@ -package extract - -func _() bool { - x := 1 - if x == 0 { //@mark(exSt2, "if") - return true - } //@mark(exEn2, "}") - return false - //@extractfunc(exSt2, exEn2) -} diff --git a/internal/lsp/testdata/extract/extract_function/extract_return_basic.go.golden b/internal/lsp/testdata/extract/extract_function/extract_return_basic.go.golden deleted file mode 100644 index 6103d1ee9..000000000 --- a/internal/lsp/testdata/extract/extract_function/extract_return_basic.go.golden +++ /dev/null @@ -1,21 +0,0 @@ --- functionextraction_extract_return_basic_5_2 -- -package extract - -func _() bool { - x := 1 - //@mark(exSt2, "if") - shouldReturn, returnValue := newFunction(x) - if shouldReturn { - return returnValue - } //@mark(exEn2, "}") - return false - //@extractfunc(exSt2, exEn2) -} - -func newFunction(x int) (bool, bool) { - if x == 0 { - return true, true - } - return false, false -} - diff --git a/internal/lsp/testdata/extract/extract_function/extract_return_basic_nonnested.go b/internal/lsp/testdata/extract/extract_function/extract_return_basic_nonnested.go deleted file mode 100644 index 08573acdd..000000000 --- a/internal/lsp/testdata/extract/extract_function/extract_return_basic_nonnested.go +++ /dev/null @@ -1,10 +0,0 @@ -package extract - -func _() bool { - x := 1 //@mark(exSt13, "x") - if x == 0 { - return true - } - return false //@mark(exEn13, "false") - //@extractfunc(exSt13, exEn13) -} diff --git a/internal/lsp/testdata/extract/extract_function/extract_return_basic_nonnested.go.golden b/internal/lsp/testdata/extract/extract_function/extract_return_basic_nonnested.go.golden deleted file mode 100644 index 19e48da01..000000000 --- a/internal/lsp/testdata/extract/extract_function/extract_return_basic_nonnested.go.golden +++ /dev/null @@ -1,17 +0,0 @@ --- functionextraction_extract_return_basic_nonnested_4_2 -- -package extract - -func _() bool { - //@mark(exSt13, "x") - return newFunction() //@mark(exEn13, "false") - //@extractfunc(exSt13, exEn13) -} - -func newFunction() bool { - x := 1 - if x == 0 { - return true - } - return false -} - diff --git a/internal/lsp/testdata/extract/extract_function/extract_return_complex.go b/internal/lsp/testdata/extract/extract_function/extract_return_complex.go deleted file mode 100644 index 605c5ec2e..000000000 --- a/internal/lsp/testdata/extract/extract_function/extract_return_complex.go +++ /dev/null @@ -1,17 +0,0 @@ -package extract - -import "fmt" - -func _() (int, string, error) { - x := 1 - y := "hello" - z := "bye" //@mark(exSt3, "z") - if y == z { - return x, y, fmt.Errorf("same") - } else { - z = "hi" - return x, z, nil - } //@mark(exEn3, "}") - return x, z, nil - //@extractfunc(exSt3, exEn3) -} diff --git a/internal/lsp/testdata/extract/extract_function/extract_return_complex.go.golden b/internal/lsp/testdata/extract/extract_function/extract_return_complex.go.golden deleted file mode 100644 index 4d201227a..000000000 --- a/internal/lsp/testdata/extract/extract_function/extract_return_complex.go.golden +++ /dev/null @@ -1,28 +0,0 @@ --- functionextraction_extract_return_complex_8_2 -- -package extract - -import "fmt" - -func _() (int, string, error) { - x := 1 - y := "hello" - //@mark(exSt3, "z") - z, shouldReturn, returnValue, returnValue1, returnValue2 := newFunction(y, x) - if shouldReturn { - return returnValue, returnValue1, returnValue2 - } //@mark(exEn3, "}") - return x, z, nil - //@extractfunc(exSt3, exEn3) -} - -func newFunction(y string, x int) (string, bool, int, string, error) { - z := "bye" - if y == z { - return "", true, x, y, fmt.Errorf("same") - } else { - z = "hi" - return "", true, x, z, nil - } - return z, false, 0, "", nil -} - diff --git a/internal/lsp/testdata/extract/extract_function/extract_return_complex_nonnested.go b/internal/lsp/testdata/extract/extract_function/extract_return_complex_nonnested.go deleted file mode 100644 index 6b2a4d8c0..000000000 --- a/internal/lsp/testdata/extract/extract_function/extract_return_complex_nonnested.go +++ /dev/null @@ -1,17 +0,0 @@ -package extract - -import "fmt" - -func _() (int, string, error) { - x := 1 - y := "hello" - z := "bye" //@mark(exSt10, "z") - if y == z { - return x, y, fmt.Errorf("same") - } else { - z = "hi" - return x, z, nil - } - return x, z, nil //@mark(exEn10, "nil") - //@extractfunc(exSt10, exEn10) -} diff --git a/internal/lsp/testdata/extract/extract_function/extract_return_complex_nonnested.go.golden b/internal/lsp/testdata/extract/extract_function/extract_return_complex_nonnested.go.golden deleted file mode 100644 index de54b1534..000000000 --- a/internal/lsp/testdata/extract/extract_function/extract_return_complex_nonnested.go.golden +++ /dev/null @@ -1,24 +0,0 @@ --- functionextraction_extract_return_complex_nonnested_8_2 -- -package extract - -import "fmt" - -func _() (int, string, error) { - x := 1 - y := "hello" - //@mark(exSt10, "z") - return newFunction(y, x) //@mark(exEn10, "nil") - //@extractfunc(exSt10, exEn10) -} - -func newFunction(y string, x int) (int, string, error) { - z := "bye" - if y == z { - return x, y, fmt.Errorf("same") - } else { - z = "hi" - return x, z, nil - } - return x, z, nil -} - diff --git a/internal/lsp/testdata/extract/extract_function/extract_return_func_lit.go b/internal/lsp/testdata/extract/extract_function/extract_return_func_lit.go deleted file mode 100644 index b3fb4fd21..000000000 --- a/internal/lsp/testdata/extract/extract_function/extract_return_func_lit.go +++ /dev/null @@ -1,13 +0,0 @@ -package extract - -import "go/ast" - -func _() { - ast.Inspect(ast.NewIdent("a"), func(n ast.Node) bool { - if n == nil { //@mark(exSt4, "if") - return true - } //@mark(exEn4, "}") - return false - }) - //@extractfunc(exSt4, exEn4) -} diff --git a/internal/lsp/testdata/extract/extract_function/extract_return_func_lit.go.golden b/internal/lsp/testdata/extract/extract_function/extract_return_func_lit.go.golden deleted file mode 100644 index 3af747c22..000000000 --- a/internal/lsp/testdata/extract/extract_function/extract_return_func_lit.go.golden +++ /dev/null @@ -1,24 +0,0 @@ --- functionextraction_extract_return_func_lit_7_3 -- -package extract - -import "go/ast" - -func _() { - ast.Inspect(ast.NewIdent("a"), func(n ast.Node) bool { - //@mark(exSt4, "if") - shouldReturn, returnValue := newFunction(n) - if shouldReturn { - return returnValue - } //@mark(exEn4, "}") - return false - }) - //@extractfunc(exSt4, exEn4) -} - -func newFunction(n ast.Node) (bool, bool) { - if n == nil { - return true, true - } - return false, false -} - diff --git a/internal/lsp/testdata/extract/extract_function/extract_return_func_lit_nonnested.go b/internal/lsp/testdata/extract/extract_function/extract_return_func_lit_nonnested.go deleted file mode 100644 index c22db2a6d..000000000 --- a/internal/lsp/testdata/extract/extract_function/extract_return_func_lit_nonnested.go +++ /dev/null @@ -1,13 +0,0 @@ -package extract - -import "go/ast" - -func _() { - ast.Inspect(ast.NewIdent("a"), func(n ast.Node) bool { - if n == nil { //@mark(exSt11, "if") - return true - } - return false //@mark(exEn11, "false") - }) - //@extractfunc(exSt11, exEn11) -} diff --git a/internal/lsp/testdata/extract/extract_function/extract_return_func_lit_nonnested.go.golden b/internal/lsp/testdata/extract/extract_function/extract_return_func_lit_nonnested.go.golden deleted file mode 100644 index efa22ba2b..000000000 --- a/internal/lsp/testdata/extract/extract_function/extract_return_func_lit_nonnested.go.golden +++ /dev/null @@ -1,20 +0,0 @@ --- functionextraction_extract_return_func_lit_nonnested_7_3 -- -package extract - -import "go/ast" - -func _() { - ast.Inspect(ast.NewIdent("a"), func(n ast.Node) bool { - //@mark(exSt11, "if") - return newFunction(n) //@mark(exEn11, "false") - }) - //@extractfunc(exSt11, exEn11) -} - -func newFunction(n ast.Node) bool { - if n == nil { - return true - } - return false -} - diff --git a/internal/lsp/testdata/extract/extract_function/extract_return_init.go b/internal/lsp/testdata/extract/extract_function/extract_return_init.go deleted file mode 100644 index c1994c1c1..000000000 --- a/internal/lsp/testdata/extract/extract_function/extract_return_init.go +++ /dev/null @@ -1,12 +0,0 @@ -package extract - -func _() string { - x := 1 - if x == 0 { //@mark(exSt5, "if") - x = 3 - return "a" - } //@mark(exEn5, "}") - x = 2 - return "b" - //@extractfunc(exSt5, exEn5) -} diff --git a/internal/lsp/testdata/extract/extract_function/extract_return_init.go.golden b/internal/lsp/testdata/extract/extract_function/extract_return_init.go.golden deleted file mode 100644 index 31d1b2ddf..000000000 --- a/internal/lsp/testdata/extract/extract_function/extract_return_init.go.golden +++ /dev/null @@ -1,23 +0,0 @@ --- functionextraction_extract_return_init_5_2 -- -package extract - -func _() string { - x := 1 - //@mark(exSt5, "if") - shouldReturn, returnValue := newFunction(x) - if shouldReturn { - return returnValue - } //@mark(exEn5, "}") - x = 2 - return "b" - //@extractfunc(exSt5, exEn5) -} - -func newFunction(x int) (bool, string) { - if x == 0 { - x = 3 - return true, "a" - } - return false, "" -} - diff --git a/internal/lsp/testdata/extract/extract_function/extract_return_init_nonnested.go b/internal/lsp/testdata/extract/extract_function/extract_return_init_nonnested.go deleted file mode 100644 index bb5ed083c..000000000 --- a/internal/lsp/testdata/extract/extract_function/extract_return_init_nonnested.go +++ /dev/null @@ -1,12 +0,0 @@ -package extract - -func _() string { - x := 1 - if x == 0 { //@mark(exSt12, "if") - x = 3 - return "a" - } - x = 2 - return "b" //@mark(exEn12, "\"b\"") - //@extractfunc(exSt12, exEn12) -} diff --git a/internal/lsp/testdata/extract/extract_function/extract_return_init_nonnested.go.golden b/internal/lsp/testdata/extract/extract_function/extract_return_init_nonnested.go.golden deleted file mode 100644 index 58bb57325..000000000 --- a/internal/lsp/testdata/extract/extract_function/extract_return_init_nonnested.go.golden +++ /dev/null @@ -1,19 +0,0 @@ --- functionextraction_extract_return_init_nonnested_5_2 -- -package extract - -func _() string { - x := 1 - //@mark(exSt12, "if") - return newFunction(x) //@mark(exEn12, "\"b\"") - //@extractfunc(exSt12, exEn12) -} - -func newFunction(x int) string { - if x == 0 { - x = 3 - return "a" - } - x = 2 - return "b" -} - diff --git a/internal/lsp/testdata/extract/extract_function/extract_scope.go b/internal/lsp/testdata/extract/extract_function/extract_scope.go deleted file mode 100644 index 6cc141fd1..000000000 --- a/internal/lsp/testdata/extract/extract_function/extract_scope.go +++ /dev/null @@ -1,10 +0,0 @@ -package extract - -func _() { - newFunction := 1 - a := newFunction //@extractfunc("a", "newFunction") -} - -func newFunction1() int { - return 1 -} diff --git a/internal/lsp/testdata/extract/extract_function/extract_scope.go.golden b/internal/lsp/testdata/extract/extract_function/extract_scope.go.golden deleted file mode 100644 index a4803b4fe..000000000 --- a/internal/lsp/testdata/extract/extract_function/extract_scope.go.golden +++ /dev/null @@ -1,16 +0,0 @@ --- functionextraction_extract_scope_5_2 -- -package extract - -func _() { - newFunction := 1 - newFunction2(newFunction) //@extractfunc("a", "newFunction") -} - -func newFunction2(newFunction int) { - a := newFunction -} - -func newFunction1() int { - return 1 -} - diff --git a/internal/lsp/testdata/extract/extract_function/extract_smart_initialization.go b/internal/lsp/testdata/extract/extract_function/extract_smart_initialization.go deleted file mode 100644 index da2c669a8..000000000 --- a/internal/lsp/testdata/extract/extract_function/extract_smart_initialization.go +++ /dev/null @@ -1,9 +0,0 @@ -package extract - -func _() { - var a []int - a = append(a, 2) //@mark(exSt6, "a") - b := 4 //@mark(exEn6, "4") - //@extractfunc(exSt6, exEn6) - a = append(a, b) -} diff --git a/internal/lsp/testdata/extract/extract_function/extract_smart_initialization.go.golden b/internal/lsp/testdata/extract/extract_function/extract_smart_initialization.go.golden deleted file mode 100644 index 8be5040c4..000000000 --- a/internal/lsp/testdata/extract/extract_function/extract_smart_initialization.go.golden +++ /dev/null @@ -1,17 +0,0 @@ --- functionextraction_extract_smart_initialization_5_2 -- -package extract - -func _() { - var a []int - //@mark(exSt6, "a") - a, b := newFunction(a) //@mark(exEn6, "4") - //@extractfunc(exSt6, exEn6) - a = append(a, b) -} - -func newFunction(a []int) ([]int, int) { - a = append(a, 2) - b := 4 - return a, b -} - diff --git a/internal/lsp/testdata/extract/extract_function/extract_smart_return.go b/internal/lsp/testdata/extract/extract_function/extract_smart_return.go deleted file mode 100644 index 264d680e2..000000000 --- a/internal/lsp/testdata/extract/extract_function/extract_smart_return.go +++ /dev/null @@ -1,11 +0,0 @@ -package extract - -func _() { - var b []int - var a int - a = 2 //@mark(exSt7, "a") - b = []int{} - b = append(b, a) //@mark(exEn7, ")") - b[0] = 1 - //@extractfunc(exSt7, exEn7) -} diff --git a/internal/lsp/testdata/extract/extract_function/extract_smart_return.go.golden b/internal/lsp/testdata/extract/extract_function/extract_smart_return.go.golden deleted file mode 100644 index fdf55ae6d..000000000 --- a/internal/lsp/testdata/extract/extract_function/extract_smart_return.go.golden +++ /dev/null @@ -1,19 +0,0 @@ --- functionextraction_extract_smart_return_6_2 -- -package extract - -func _() { - var b []int - var a int - //@mark(exSt7, "a") - b = newFunction(a, b) //@mark(exEn7, ")") - b[0] = 1 - //@extractfunc(exSt7, exEn7) -} - -func newFunction(a int, b []int) []int { - a = 2 - b = []int{} - b = append(b, a) - return b -} - diff --git a/internal/lsp/testdata/extract/extract_function/extract_unnecessary_param.go b/internal/lsp/testdata/extract/extract_function/extract_unnecessary_param.go deleted file mode 100644 index a6eb1f872..000000000 --- a/internal/lsp/testdata/extract/extract_function/extract_unnecessary_param.go +++ /dev/null @@ -1,14 +0,0 @@ -package extract - -func _() { - var b []int - var a int - a := 2 //@mark(exSt8, "a") - b = []int{} - b = append(b, a) //@mark(exEn8, ")") - b[0] = 1 - if a == 2 { - return - } - //@extractfunc(exSt8, exEn8) -} diff --git a/internal/lsp/testdata/extract/extract_function/extract_unnecessary_param.go.golden b/internal/lsp/testdata/extract/extract_function/extract_unnecessary_param.go.golden deleted file mode 100644 index 4374f3728..000000000 --- a/internal/lsp/testdata/extract/extract_function/extract_unnecessary_param.go.golden +++ /dev/null @@ -1,22 +0,0 @@ --- functionextraction_extract_unnecessary_param_6_2 -- -package extract - -func _() { - var b []int - var a int - //@mark(exSt8, "a") - a, b = newFunction(b) //@mark(exEn8, ")") - b[0] = 1 - if a == 2 { - return - } - //@extractfunc(exSt8, exEn8) -} - -func newFunction(b []int) (int, []int) { - a := 2 - b = []int{} - b = append(b, a) - return a, b -} - diff --git a/internal/lsp/testdata/extract/extract_method/extract_basic.go b/internal/lsp/testdata/extract/extract_method/extract_basic.go deleted file mode 100644 index c9a8d9dce..000000000 --- a/internal/lsp/testdata/extract/extract_method/extract_basic.go +++ /dev/null @@ -1,24 +0,0 @@ -package extract - -type A struct { - x int - y int -} - -func (a *A) XLessThanYP() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a *A) AddP() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - -func (a A) XLessThanY() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a A) Add() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} diff --git a/internal/lsp/testdata/extract/extract_method/extract_basic.go.golden b/internal/lsp/testdata/extract/extract_method/extract_basic.go.golden deleted file mode 100644 index eab22a673..000000000 --- a/internal/lsp/testdata/extract/extract_method/extract_basic.go.golden +++ /dev/null @@ -1,728 +0,0 @@ --- functionextraction_extract_basic_13_2 -- -package extract - -type A struct { - x int - y int -} - -func (a *A) XLessThanYP() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a *A) AddP() int { - sum := newFunction(a) //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - -func newFunction(a *A) int { - sum := a.x + a.y - return sum -} - -func (a A) XLessThanY() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a A) Add() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - --- functionextraction_extract_basic_14_2 -- -package extract - -type A struct { - x int - y int -} - -func (a *A) XLessThanYP() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a *A) AddP() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return newFunction(sum) //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - -func newFunction(sum int) int { - return sum -} - -func (a A) XLessThanY() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a A) Add() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - --- functionextraction_extract_basic_18_2 -- -package extract - -type A struct { - x int - y int -} - -func (a *A) XLessThanYP() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a *A) AddP() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - -func (a A) XLessThanY() bool { - return newFunction(a) //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func newFunction(a A) bool { - return a.x < a.y -} - -func (a A) Add() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - --- functionextraction_extract_basic_22_2 -- -package extract - -type A struct { - x int - y int -} - -func (a *A) XLessThanYP() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a *A) AddP() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - -func (a A) XLessThanY() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a A) Add() int { - sum := newFunction(a) //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - -func newFunction(a A) int { - sum := a.x + a.y - return sum -} - --- functionextraction_extract_basic_23_2 -- -package extract - -type A struct { - x int - y int -} - -func (a *A) XLessThanYP() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a *A) AddP() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - -func (a A) XLessThanY() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a A) Add() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return newFunction(sum) //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - -func newFunction(sum int) int { - return sum -} - --- functionextraction_extract_basic_9_2 -- -package extract - -type A struct { - x int - y int -} - -func (a *A) XLessThanYP() bool { - return newFunction(a) //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func newFunction(a *A) bool { - return a.x < a.y -} - -func (a *A) AddP() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - -func (a A) XLessThanY() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a A) Add() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - --- functionextraction_extract_method_13_2 -- -package extract - -type A struct { - x int - y int -} - -func (a *A) XLessThanYP() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a *A) AddP() int { - sum := newFunction(a) //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - -func newFunction(a *A) int { - sum := a.x + a.y - return sum -} - -func (a A) XLessThanY() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a A) Add() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - --- functionextraction_extract_method_14_2 -- -package extract - -type A struct { - x int - y int -} - -func (a *A) XLessThanYP() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a *A) AddP() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return newFunction(sum) //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - -func newFunction(sum int) int { - return sum -} - -func (a A) XLessThanY() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a A) Add() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - --- functionextraction_extract_method_18_2 -- -package extract - -type A struct { - x int - y int -} - -func (a *A) XLessThanYP() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a *A) AddP() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - -func (a A) XLessThanY() bool { - return newFunction(a) //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func newFunction(a A) bool { - return a.x < a.y -} - -func (a A) Add() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - --- functionextraction_extract_method_22_2 -- -package extract - -type A struct { - x int - y int -} - -func (a *A) XLessThanYP() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a *A) AddP() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - -func (a A) XLessThanY() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a A) Add() int { - sum := newFunction(a) //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - -func newFunction(a A) int { - sum := a.x + a.y - return sum -} - --- functionextraction_extract_method_23_2 -- -package extract - -type A struct { - x int - y int -} - -func (a *A) XLessThanYP() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a *A) AddP() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - -func (a A) XLessThanY() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a A) Add() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return newFunction(sum) //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - -func newFunction(sum int) int { - return sum -} - --- functionextraction_extract_method_9_2 -- -package extract - -type A struct { - x int - y int -} - -func (a *A) XLessThanYP() bool { - return newFunction(a) //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func newFunction(a *A) bool { - return a.x < a.y -} - -func (a *A) AddP() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - -func (a A) XLessThanY() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a A) Add() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - --- methodextraction_extract_basic_13_2 -- -package extract - -type A struct { - x int - y int -} - -func (a *A) XLessThanYP() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a *A) AddP() int { - sum := a.newMethod() //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - -func (a *A) newMethod() int { - sum := a.x + a.y - return sum -} - -func (a A) XLessThanY() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a A) Add() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - --- methodextraction_extract_basic_14_2 -- -package extract - -type A struct { - x int - y int -} - -func (a *A) XLessThanYP() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a *A) AddP() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return a.newMethod(sum) //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - -func (*A) newMethod(sum int) int { - return sum -} - -func (a A) XLessThanY() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a A) Add() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - --- methodextraction_extract_basic_18_2 -- -package extract - -type A struct { - x int - y int -} - -func (a *A) XLessThanYP() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a *A) AddP() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - -func (a A) XLessThanY() bool { - return a.newMethod() //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a A) newMethod() bool { - return a.x < a.y -} - -func (a A) Add() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - --- methodextraction_extract_basic_22_2 -- -package extract - -type A struct { - x int - y int -} - -func (a *A) XLessThanYP() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a *A) AddP() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - -func (a A) XLessThanY() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a A) Add() int { - sum := a.newMethod() //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - -func (a A) newMethod() int { - sum := a.x + a.y - return sum -} - --- methodextraction_extract_basic_23_2 -- -package extract - -type A struct { - x int - y int -} - -func (a *A) XLessThanYP() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a *A) AddP() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - -func (a A) XLessThanY() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a A) Add() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return a.newMethod(sum) //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - -func (A) newMethod(sum int) int { - return sum -} - --- methodextraction_extract_basic_9_2 -- -package extract - -type A struct { - x int - y int -} - -func (a *A) XLessThanYP() bool { - return a.newMethod() //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a *A) newMethod() bool { - return a.x < a.y -} - -func (a *A) AddP() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - -func (a A) XLessThanY() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a A) Add() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - --- methodextraction_extract_method_13_2 -- -package extract - -type A struct { - x int - y int -} - -func (a *A) XLessThanYP() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a *A) AddP() int { - sum := a.newMethod() //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - -func (a *A) newMethod() int { - sum := a.x + a.y - return sum -} - -func (a A) XLessThanY() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a A) Add() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - --- methodextraction_extract_method_14_2 -- -package extract - -type A struct { - x int - y int -} - -func (a *A) XLessThanYP() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a *A) AddP() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return a.newMethod(sum) //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - -func (*A) newMethod(sum int) int { - return sum -} - -func (a A) XLessThanY() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a A) Add() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - --- methodextraction_extract_method_18_2 -- -package extract - -type A struct { - x int - y int -} - -func (a *A) XLessThanYP() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a *A) AddP() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - -func (a A) XLessThanY() bool { - return a.newMethod() //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a A) newMethod() bool { - return a.x < a.y -} - -func (a A) Add() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - --- methodextraction_extract_method_22_2 -- -package extract - -type A struct { - x int - y int -} - -func (a *A) XLessThanYP() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a *A) AddP() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - -func (a A) XLessThanY() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a A) Add() int { - sum := a.newMethod() //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - -func (a A) newMethod() int { - sum := a.x + a.y - return sum -} - --- methodextraction_extract_method_23_2 -- -package extract - -type A struct { - x int - y int -} - -func (a *A) XLessThanYP() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a *A) AddP() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - -func (a A) XLessThanY() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a A) Add() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return a.newMethod(sum) //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - -func (A) newMethod(sum int) int { - return sum -} - --- methodextraction_extract_method_9_2 -- -package extract - -type A struct { - x int - y int -} - -func (a *A) XLessThanYP() bool { - return a.newMethod() //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a *A) newMethod() bool { - return a.x < a.y -} - -func (a *A) AddP() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - -func (a A) XLessThanY() bool { - return a.x < a.y //@extractmethod("return", "a.y"),extractfunc("return", "a.y") -} - -func (a A) Add() int { - sum := a.x + a.y //@extractmethod("sum", "a.y"),extractfunc("sum", "a.y") - return sum //@extractmethod("return", "sum"),extractfunc("return", "sum") -} - diff --git a/internal/lsp/testdata/extract/extract_variable/extract_basic_lit.go b/internal/lsp/testdata/extract/extract_variable/extract_basic_lit.go deleted file mode 100644 index c49e5d6a0..000000000 --- a/internal/lsp/testdata/extract/extract_variable/extract_basic_lit.go +++ /dev/null @@ -1,6 +0,0 @@ -package extract - -func _() { - var _ = 1 + 2 //@suggestedfix("1", "refactor.extract") - var _ = 3 + 4 //@suggestedfix("3 + 4", "refactor.extract") -} diff --git a/internal/lsp/testdata/extract/extract_variable/extract_basic_lit.go.golden b/internal/lsp/testdata/extract/extract_variable/extract_basic_lit.go.golden deleted file mode 100644 index 00ee7b4f9..000000000 --- a/internal/lsp/testdata/extract/extract_variable/extract_basic_lit.go.golden +++ /dev/null @@ -1,18 +0,0 @@ --- suggestedfix_extract_basic_lit_4_10 -- -package extract - -func _() { - x := 1 - var _ = x + 2 //@suggestedfix("1", "refactor.extract") - var _ = 3 + 4 //@suggestedfix("3 + 4", "refactor.extract") -} - --- suggestedfix_extract_basic_lit_5_10 -- -package extract - -func _() { - var _ = 1 + 2 //@suggestedfix("1", "refactor.extract") - x := 3 + 4 - var _ = x //@suggestedfix("3 + 4", "refactor.extract") -} - diff --git a/internal/lsp/testdata/extract/extract_variable/extract_func_call.go b/internal/lsp/testdata/extract/extract_variable/extract_func_call.go deleted file mode 100644 index badc010dc..000000000 --- a/internal/lsp/testdata/extract/extract_variable/extract_func_call.go +++ /dev/null @@ -1,9 +0,0 @@ -package extract - -import "strconv" - -func _() { - x0 := append([]int{}, 1) //@suggestedfix("append([]int{}, 1)", "refactor.extract") - str := "1" - b, err := strconv.Atoi(str) //@suggestedfix("strconv.Atoi(str)", "refactor.extract") -} diff --git a/internal/lsp/testdata/extract/extract_variable/extract_func_call.go.golden b/internal/lsp/testdata/extract/extract_variable/extract_func_call.go.golden deleted file mode 100644 index 74df67ee6..000000000 --- a/internal/lsp/testdata/extract/extract_variable/extract_func_call.go.golden +++ /dev/null @@ -1,36 +0,0 @@ --- suggestedfix_extract_func_call_6_7 -- -package extract - -import "strconv" - -func _() { - x0 := append([]int{}, 1) - a := x0 //@suggestedfix("append([]int{}, 1)", "refactor.extract") - str := "1" - b, err := strconv.Atoi(str) //@suggestedfix("strconv.Atoi(str)", "refactor.extract") -} - --- suggestedfix_extract_func_call_6_8 -- -package extract - -import "strconv" - -func _() { - x := append([]int{}, 1) - x0 := x //@suggestedfix("append([]int{}, 1)", "refactor.extract") - str := "1" - b, err := strconv.Atoi(str) //@suggestedfix("strconv.Atoi(str)", "refactor.extract") -} - --- suggestedfix_extract_func_call_8_12 -- -package extract - -import "strconv" - -func _() { - x0 := append([]int{}, 1) //@suggestedfix("append([]int{}, 1)", "refactor.extract") - str := "1" - x, x1 := strconv.Atoi(str) - b, err := x, x1 //@suggestedfix("strconv.Atoi(str)", "refactor.extract") -} - diff --git a/internal/lsp/testdata/extract/extract_variable/extract_scope.go b/internal/lsp/testdata/extract/extract_variable/extract_scope.go deleted file mode 100644 index 5dfcc3620..000000000 --- a/internal/lsp/testdata/extract/extract_variable/extract_scope.go +++ /dev/null @@ -1,13 +0,0 @@ -package extract - -import "go/ast" - -func _() { - x0 := 0 - if true { - y := ast.CompositeLit{} //@suggestedfix("ast.CompositeLit{}", "refactor.extract") - } - if true { - x1 := !false //@suggestedfix("!false", "refactor.extract") - } -} diff --git a/internal/lsp/testdata/extract/extract_variable/extract_scope.go.golden b/internal/lsp/testdata/extract/extract_variable/extract_scope.go.golden deleted file mode 100644 index e0e6464b5..000000000 --- a/internal/lsp/testdata/extract/extract_variable/extract_scope.go.golden +++ /dev/null @@ -1,32 +0,0 @@ --- suggestedfix_extract_scope_11_9 -- -package extract - -import "go/ast" - -func _() { - x0 := 0 - if true { - y := ast.CompositeLit{} //@suggestedfix("ast.CompositeLit{}", "refactor.extract") - } - if true { - x := !false - x1 := x //@suggestedfix("!false", "refactor.extract") - } -} - --- suggestedfix_extract_scope_8_8 -- -package extract - -import "go/ast" - -func _() { - x0 := 0 - if true { - x := ast.CompositeLit{} - y := x //@suggestedfix("ast.CompositeLit{}", "refactor.extract") - } - if true { - x1 := !false //@suggestedfix("!false", "refactor.extract") - } -} - |