commit f79515f338230420deefba76e168cfd29f52942d
author Ian Cottrell <iancottrell@google.com> Thu Oct 10 23:06:52 2019 -0400
committer Ian Cottrell <iancottrell@google.com> Thu Nov 07 01:09:34 2019 +0000
tree 698693938e5684695e3d9c9fffc673916a38f143
parent c2ac6c2a2d7ef39f1c4c195d1cd731098986857f

gopls: control features for command line tests

A general mechanism for modifying the features in command line tests
Use it to turn of go-diff for now

Fixes golang/go#35392

Change-Id: Ie79723e94fb14fcde1e98709a63f44046e101bc4
Reviewed-on: https://go-review.googlesource.com/c/tools/+/205739
Run-TryBot: Ian Cottrell <iancottrell@google.com>
Reviewed-by: Rebecca Stambler <rstambler@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>

gopls/test/gopls_test.go

diff --git a/gopls/test/gopls_test.go b/gopls/test/gopls_test.go
index 15ecfa4..d57a9a6 100644
--- a/gopls/test/gopls_test.go
+++ b/gopls/test/gopls_test.go
@@ -11,6 +11,7 @@
 	"golang.org/x/tools/go/packages/packagestest"
 	"golang.org/x/tools/gopls/internal/hooks"
 	cmdtest "golang.org/x/tools/internal/lsp/cmd/test"
+	"golang.org/x/tools/internal/lsp/source"
 	"golang.org/x/tools/internal/lsp/tests"
 	"golang.org/x/tools/internal/testenv"
 )
@@ -24,6 +25,12 @@
 	packagestest.TestAll(t, testCommandLine)
 }
 
+func commandLineOptions(options *source.Options) {
+	options.StaticCheck = true
+	options.GoDiff = false
+	hooks.Options(options)
+}
+
 func testCommandLine(t *testing.T, exporter packagestest.Exporter) {
 	const testdata = "../../internal/lsp/testdata"
 	if stat, err := os.Stat(testdata); err != nil || !stat.IsDir() {
@@ -31,5 +38,5 @@
 	}
 	data := tests.Load(t, exporter, testdata)
 	defer data.Exported.Cleanup()
-	tests.Run(t, cmdtest.NewRunner(exporter, data, tests.Context(t), hooks.Options), data)
+	tests.Run(t, cmdtest.NewRunner(exporter, data, tests.Context(t), commandLineOptions), data)
 }