gopls/internal/test/marker: reorganize undeclared test files

Rename test file names under undeclared as the test file
names (i.e. "missingXXX") repeat the dir (i.e. "undeclare").

Merge the case relevant to "return" to func.txt.

Change-Id: Ib74f8a52e7ebff70d3416ee77cc9ee4a370b36b1
Reviewed-on: https://go-review.googlesource.com/c/tools/+/848325
Reviewed-by: Peter Weinberger <pjw@google.com>
Auto-Submit: Hongxiang Jiang <hxjiang@golang.org>
LUCI-TryBot-Result: golang-scoped@luci-project-accounts.iam.gserviceaccount.com <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>

gopls/internal/test/marker/testdata/quickfix/undeclared/func.txt

diff --git a/gopls/internal/test/marker/testdata/quickfix/undeclared/missingfunction.txt b/gopls/internal/test/marker/testdata/quickfix/undeclared/func.txt
similarity index 92%
rename from gopls/internal/test/marker/testdata/quickfix/undeclared/missingfunction.txt
rename to gopls/internal/test/marker/testdata/quickfix/undeclared/func.txt
index 3dd42a1..f75eab6 100644
--- a/gopls/internal/test/marker/testdata/quickfix/undeclared/missingfunction.txt
+++ b/gopls/internal/test/marker/testdata/quickfix/undeclared/func.txt
@@ -153,3 +153,15 @@
 +func assign() int {
 +	panic("unimplemented")
 +}
+-- return.go --
+package missingfunction
+
+func inferFromReturn() int {
+	return foo(1, "") //@quickfix("foo", re"(undeclared|undefined)", infer_return)
+}
+-- @infer_return/return.go --
+@@ -6 +6,4 @@
++
++func foo(i int, s string) int {
++	panic("unimplemented")
++}

gopls/internal/test/marker/testdata/quickfix/undeclared/type.txt

diff --git a/gopls/internal/test/marker/testdata/quickfix/undeclared/undeclared_type.txt b/gopls/internal/test/marker/testdata/quickfix/undeclared/type.txt
similarity index 100%
rename from gopls/internal/test/marker/testdata/quickfix/undeclared/undeclared_type.txt
rename to gopls/internal/test/marker/testdata/quickfix/undeclared/type.txt

gopls/internal/test/marker/testdata/quickfix/undeclared/undeclaredfunc.txt

diff --git a/gopls/internal/test/marker/testdata/quickfix/undeclared/undeclaredfunc.txt b/gopls/internal/test/marker/testdata/quickfix/undeclared/undeclaredfunc.txt
deleted file mode 100644
index 68940ca..0000000
--- a/gopls/internal/test/marker/testdata/quickfix/undeclared/undeclaredfunc.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-This test checks the quick fix for "undeclared: f" that declares the
-missing function. See #47558.
-
--- a.go --
-package a
-
-func _() int { return f(1, "") } //@quickfix(re"f.1", re"unde(fined|clared name): f", x)
-
--- @x/a.go --
-@@ -3 +3 @@
--func _() int { return f(1, "") } //@quickfix(re"f.1", re"unde(fined|clared name): f", x)
-+func _() int { return f(1, "") }
-@@ -5 +5,4 @@
-+func f(i int, s string) int {
-+	panic("unimplemented")
-+} //@quickfix(re"f.1", re"unde(fined|clared name): f", x)
-+

gopls/internal/test/marker/testdata/quickfix/undeclared/var.txt

diff --git a/gopls/internal/test/marker/testdata/quickfix/undeclared/undeclared_variable.txt b/gopls/internal/test/marker/testdata/quickfix/undeclared/var.txt
similarity index 100%
rename from gopls/internal/test/marker/testdata/quickfix/undeclared/undeclared_variable.txt
rename to gopls/internal/test/marker/testdata/quickfix/undeclared/var.txt