From 279ab8e0019826e01e5eaf7ee88a3c89a0e5678d Mon Sep 17 00:00:00 2001
From: Rebecca Stambler <rstambler@golang.org>
Date: Tue, 5 Feb 2019 19:10:40 -0500
Subject: [PATCH] internal/lsp, go/packages/packagestest: support testing test
 files

This change allows testdata files to be *_test.go files.

Change-Id: Ic771ea7c89ff2d2aabd1af8be56f9c7286da9053
Reviewed-on: https://go-review.googlesource.com/c/161317
Reviewed-by: Ian Cottrell <iancottrell@google.com>
---
 go/packages/packagestest/export.go        | 1 +
 internal/lsp/lsp_test.go                  | 2 +-
 internal/lsp/testdata/testy/testy.go      | 3 +++
 internal/lsp/testdata/testy/testy_test.go | 8 ++++++++
 4 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 internal/lsp/testdata/testy/testy.go
 create mode 100644 internal/lsp/testdata/testy/testy_test.go

diff --git a/go/packages/packagestest/export.go b/go/packages/packagestest/export.go
index ad38ebf1..14424951 100644
--- a/go/packages/packagestest/export.go
+++ b/go/packages/packagestest/export.go
@@ -136,6 +136,7 @@ func Export(t testing.TB, exporter Exporter, modules []Module) *Exported {
 			Dir:     temp,
 			Env:     append(os.Environ(), "GOPACKAGESDRIVER=off"),
 			Overlay: make(map[string][]byte),
+			Tests:   true,
 		},
 		Modules: modules,
 		temp:    temp,
diff --git a/internal/lsp/lsp_test.go b/internal/lsp/lsp_test.go
index 73d614e3..94bad72a 100644
--- a/internal/lsp/lsp_test.go
+++ b/internal/lsp/lsp_test.go
@@ -36,7 +36,7 @@ func testLSP(t *testing.T, exporter packagestest.Exporter) {
 	// We hardcode the expected number of test cases to ensure that all tests
 	// are being executed. If a test is added, this number must be changed.
 	const expectedCompletionsCount = 63
-	const expectedDiagnosticsCount = 13
+	const expectedDiagnosticsCount = 14
 	const expectedFormatCount = 3
 	const expectedDefinitionsCount = 16
 	const expectedTypeDefinitionsCount = 2
diff --git a/internal/lsp/testdata/testy/testy.go b/internal/lsp/testdata/testy/testy.go
new file mode 100644
index 00000000..a72cef89
--- /dev/null
+++ b/internal/lsp/testdata/testy/testy.go
@@ -0,0 +1,3 @@
+package testy
+
+func a() {}
diff --git a/internal/lsp/testdata/testy/testy_test.go b/internal/lsp/testdata/testy/testy_test.go
new file mode 100644
index 00000000..b1e0c82d
--- /dev/null
+++ b/internal/lsp/testdata/testy/testy_test.go
@@ -0,0 +1,8 @@
+package testy
+
+import "testing"
+
+func TestSomething(t *testing.T) { //@item(TestSomething, "TestSomething(t *testing.T)", "", "func")
+	var x int //@diag("x", "x declared but not used")
+	a()
+}