gopls/internal/regtest: remove redundant 'With' from run options

Now that the correct way to invoke regtests is via withOptions(...).run,
all the 'With' prefixes in option names seem redundant.

Change-Id: Icbbb00e15d034726d1e0cb13ff82b4f832add286
Reviewed-on: https://go-review.googlesource.com/c/tools/+/276974
Run-TryBot: Robert Findley <rfindley@google.com>
gopls-CI: kokoro <noreply+kokoro@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Trust: Robert Findley <rfindley@google.com>
Reviewed-by: Rebecca Stambler <rstambler@golang.org>

Author: findleyr

gopls/internal/regtest/codelens_test.go

@@ -117,7 +117,7 @@ func main() {
 	} {
 		t.Run(commandTitle, func(t *testing.T) {
 			withOptions(
-				WithProxyFiles(proxyWithLatest),
+				ProxyFiles(proxyWithLatest),
 			).run(t, shouldUpdateDep, func(t *testing.T, env *Env) {
 				env.OpenFile("go.mod")
 				var lens protocol.CodeLens
@@ -210,7 +210,7 @@ require golang.org/x/hello v1.0.0
 		if got != wantGoMod {
 			t.Fatalf("go.mod tidy failed:\n%s", tests.Diff(wantGoMod, got))
 		}
-	}, WithProxyFiles(proxy))
+	}, ProxyFiles(proxy))
 }
 
 func TestRegenerateCgo(t *testing.T) {

gopls/internal/regtest/diagnostics_test.go

@@ -290,7 +290,7 @@ func Hello() {
 
 	t.Run("without workspace module", func(t *testing.T) {
 		withOptions(
-			WithModes(Singleton),
+			Modes(Singleton),
 		).run(t, noMod, func(t *testing.T, env *Env) {
 			env.Await(
 				env.DiagnosticAtRegexp("main.go", `"mod.com/bob"`),
@@ -424,7 +424,7 @@ func TestResolveDiagnosticWithDownload(t *testing.T) {
 		// diagnostic for the wrong formatting type.
 		// TODO: we should be able to easily also match the diagnostic message.
 		env.Await(env.DiagnosticAtRegexp("print.go", "fmt.Printf"))
-	}, WithProxyFiles(testPackageWithRequireProxy))
+	}, ProxyFiles(testPackageWithRequireProxy))
 }
 
 func TestMissingDependency(t *testing.T) {
@@ -655,7 +655,7 @@ func main() {
 }
 `
 	withOptions(
-		WithProxyFiles(ardanLabsProxy),
+		ProxyFiles(ardanLabsProxy),
 	).run(t, ardanLabs, func(t *testing.T, env *Env) {
 		// Expect a diagnostic with a suggested fix to add
 		// "github.com/ardanlabs/conf" to the go.mod file.
@@ -713,7 +713,7 @@ go 1.12
 -- main.go --
 `
 	withOptions(
-		WithProxyFiles(ardanLabsProxy),
+		ProxyFiles(ardanLabsProxy),
 	).run(t, emptyFile, func(t *testing.T, env *Env) {
 		env.OpenFile("main.go")
 		env.EditBuffer("main.go", fake.NewEdit(0, 0, 0, 0, `package main
@@ -1251,13 +1251,13 @@ func main() {
 	var x int
 }
 `
-	withOptions(WithRootPath("a")).run(t, mod, func(t *testing.T, env *Env) {
+	withOptions(RootPath("a")).run(t, mod, func(t *testing.T, env *Env) {
 		env.OpenFile("a/main.go")
 		env.Await(
 			env.DiagnosticAtRegexp("main.go", "x"),
 		)
 	})
-	withOptions(WithRootPath("a"), LimitWorkspaceScope()).run(t, mod, func(t *testing.T, env *Env) {
+	withOptions(RootPath("a"), LimitWorkspaceScope()).run(t, mod, func(t *testing.T, env *Env) {
 		env.OpenFile("a/main.go")
 		env.Await(
 			NoDiagnostics("main.go"),
@@ -1475,7 +1475,7 @@ package foo_
 `
 
 	withOptions(
-		WithProxyFiles(proxy),
+		ProxyFiles(proxy),
 		InGOPATH(),
 	).run(t, contents, func(t *testing.T, env *Env) {
 		// Simulate typing character by character.
@@ -1625,7 +1625,7 @@ import (
 			EditorConfig{
 				Env: map[string]string{"GO111MODULE": "off"},
 			},
-			WithModes(Singleton),
+			Modes(Singleton),
 		).run(t, mod, func(t *testing.T, env *Env) {
 			env.Await(
 				env.DiagnosticAtRegexpWithMessage("main.go", `"nosuchpkg"`, `cannot find package "nosuchpkg" in any of`),
@@ -1652,7 +1652,7 @@ package b
 	for _, go111module := range []string{"on", "auto"} {
 		t.Run("GO111MODULE="+go111module, func(t *testing.T) {
 			withOptions(
-				WithModes(Singleton),
+				Modes(Singleton),
 				EditorConfig{
 					Env: map[string]string{
 						"GO111MODULE": go111module,
@@ -1673,7 +1673,7 @@ package b
 	// Expect no warning if GO111MODULE=auto in a directory in GOPATH.
 	t.Run("GOPATH_GO111MODULE_auto", func(t *testing.T) {
 		withOptions(
-			WithModes(Singleton),
+			Modes(Singleton),
 			EditorConfig{
 				Env: map[string]string{
 					"GO111MODULE": "auto",
@@ -1738,8 +1738,8 @@ package hello
 func helloHelper() {}
 `
 	withOptions(
-		WithProxyFiles(proxy),
-		WithModes(Singleton),
+		ProxyFiles(proxy),
+		Modes(Singleton),
 	).run(t, nested, func(t *testing.T, env *Env) {
 		// Expect a diagnostic in a nested module.
 		env.OpenFile("nested/hello/hello.go")

gopls/internal/regtest/imports_test.go

@@ -150,7 +150,7 @@ var _, _ = x.X, y.Y
 	editorConfig := EditorConfig{Env: map[string]string{"GOMODCACHE": modcache}}
 	withOptions(
 		editorConfig,
-		WithProxyFiles(proxy),
+		ProxyFiles(proxy),
 	).run(t, files, func(t *testing.T, env *Env) {
 		env.OpenFile("main.go")
 		env.Await(env.DiagnosticAtRegexp("main.go", `y.Y`))

gopls/internal/regtest/link_test.go

@@ -87,5 +87,5 @@ const Hello = "Hello"
 		if len(links) != 0 {
 			t.Errorf("documentLink: got %d document links for go.mod, want 0\nlinks: %v", len(links), links)
 		}
-	}, WithProxyFiles(proxy))
+	}, ProxyFiles(proxy))
 }

gopls/internal/regtest/modfile_test.go

@@ -35,10 +35,10 @@ const Name = "Hello"
 
 func runModfileTest(t *testing.T, files, proxy string, f TestFunc) {
 	t.Run("normal", func(t *testing.T) {
-		withOptions(WithProxyFiles(proxy)).run(t, files, f)
+		withOptions(ProxyFiles(proxy)).run(t, files, f)
 	})
 	t.Run("nested", func(t *testing.T) {
-		withOptions(WithProxyFiles(proxy), NestWorkdir(), WithModes(Singleton|Experimental)).run(t, files, f)
+		withOptions(ProxyFiles(proxy), NestWorkdir(), Modes(Singleton|Experimental)).run(t, files, f)
 	})
 }
 
@@ -434,7 +434,7 @@ import "example.com/blah/v2"
 
 var _ = blah.Name
 `
-	withOptions(WithProxyFiles(proxy)).run(t, files, func(t *testing.T, env *Env) {
+	withOptions(ProxyFiles(proxy)).run(t, files, func(t *testing.T, env *Env) {
 		env.OpenFile("main.go")
 		env.OpenFile("go.mod")
 		var d protocol.PublishDiagnosticsParams
@@ -620,8 +620,8 @@ func main() {
 				"GOFLAGS": "-mod=readonly",
 			},
 		},
-		WithProxyFiles(proxy),
-		WithModes(Singleton),
+		ProxyFiles(proxy),
+		Modes(Singleton),
 	).run(t, mod, func(t *testing.T, env *Env) {
 		env.OpenFile("main.go")
 		original := env.ReadWorkspaceFile("go.mod")
@@ -670,8 +670,8 @@ func main() {
 }
 `
 	withOptions(
-		WithProxyFiles(workspaceProxy),
-		WithModes(Experimental),
+		ProxyFiles(workspaceProxy),
+		Modes(Experimental),
 	).run(t, mod, func(t *testing.T, env *Env) {
 		env.Await(
 			env.DiagnosticAtRegexp("a/go.mod", "example.com v1.2.3"),
@@ -700,7 +700,7 @@ func main() {
 }
 `
 	withOptions(
-		WithProxyFiles(workspaceProxy),
+		ProxyFiles(workspaceProxy),
 		EditorConfig{
 			BuildFlags: []string{"-tags", "bob"},
 		},

gopls/internal/regtest/runner.go

@@ -100,22 +100,22 @@ func (f optionSetter) set(opts *runConfig) {
 	f(opts)
 }
 
-// WithTimeout configures a custom timeout for this test run.
-func WithTimeout(d time.Duration) RunOption {
+// Timeout configures a custom timeout for this test run.
+func Timeout(d time.Duration) RunOption {
 	return optionSetter(func(opts *runConfig) {
 		opts.timeout = d
 	})
 }
 
-// WithProxyFiles configures a file proxy using the given txtar-encoded string.
-func WithProxyFiles(txt string) RunOption {
+// ProxyFiles configures a file proxy using the given txtar-encoded string.
+func ProxyFiles(txt string) RunOption {
 	return optionSetter(func(opts *runConfig) {
 		opts.sandbox.ProxyFiles = txt
 	})
 }
 
-// WithModes configures the execution modes that the test should run in.
-func WithModes(modes Mode) RunOption {
+// Modes configures the execution modes that the test should run in.
+func Modes(modes Mode) RunOption {
 	return optionSetter(func(opts *runConfig) {
 		opts.modes = modes
 	})
@@ -144,10 +144,10 @@ func WithoutWorkspaceFolders() RunOption {
 	})
 }
 
-// WithRootPath specifies the rootURI of the workspace folder opened in the
+// RootPath specifies the rootURI of the workspace folder opened in the
 // editor. By default, the sandbox opens the top-level directory, but some
 // tests need to check other cases.
-func WithRootPath(path string) RunOption {
+func RootPath(path string) RunOption {
 	return optionSetter(func(opts *runConfig) {
 		opts.editor.WorkspaceRoot = path
 	})
@@ -161,10 +161,10 @@ func InGOPATH() RunOption {
 	})
 }
 
-// WithDebugAddress configures a debug server bound to addr. This option is
+// DebugAddress configures a debug server bound to addr. This option is
 // currently only supported when executing in Singleton mode. It is intended to
 // be used for long-running stress tests.
-func WithDebugAddress(addr string) RunOption {
+func DebugAddress(addr string) RunOption {
 	return optionSetter(func(opts *runConfig) {
 		opts.debugAddr = addr
 	})
@@ -196,10 +196,10 @@ func SkipHooks(skip bool) RunOption {
 	})
 }
 
-// WithGOPROXY configures the test environment to have an explicit proxy value.
+// GOPROXY configures the test environment to have an explicit proxy value.
 // This is intended for stress tests -- to ensure their isolation, regtests
 // should instead use WithProxyFiles.
-func WithGOPROXY(goproxy string) RunOption {
+func GOPROXY(goproxy string) RunOption {
 	return optionSetter(func(opts *runConfig) {
 		opts.sandbox.GOPROXY = goproxy
 	})

gopls/internal/regtest/shared_test.go

@@ -30,7 +30,7 @@ func runShared(t *testing.T, program string, testFunc func(env1 *Env, env2 *Env)
 		// as the first.
 		env2 := NewEnv(env1.Ctx, t, env1.Sandbox, env1.Server, env1.Editor.Config, true)
 		testFunc(env1, env2)
-	}, WithModes(modes))
+	}, Modes(modes))
 }
 
 func TestSimultaneousEdits(t *testing.T) {

gopls/internal/regtest/stress_test.go

@@ -27,20 +27,20 @@ func stressTestOptions(dir string) []RunOption {
 		InExistingDir(dir),
 
 		// Enable live debugging.
-		WithDebugAddress(":8087"),
+		DebugAddress(":8087"),
 
 		// Skip logs as they buffer up memory unnaturally.
 		SkipLogs(),
 		// Similarly to logs: disable hooks so that they don't affect performance.
 		SkipHooks(true),
 		// The Debug server only makes sense if running in singleton mode.
-		WithModes(Singleton),
+		Modes(Singleton),
 		// Set a generous timeout. Individual tests should control their own
 		// graceful termination.
-		WithTimeout(20 * time.Minute),
+		Timeout(20 * time.Minute),
 
 		// Use the actual proxy, since we want our builds to succeed.
-		WithGOPROXY("https://proxy.golang.org"),
+		GOPROXY("https://proxy.golang.org"),
 	}
 }
 

gopls/internal/regtest/vendor_test.go

@@ -46,8 +46,8 @@ func _() {
 `
 	// TODO(rstambler): Remove this when golang/go#41819 is resolved.
 	withOptions(
-		WithModes(Singleton),
-		WithProxyFiles(basicProxy),
+		Modes(Singleton),
+		ProxyFiles(basicProxy),
 	).run(t, pkgThatUsesVendoring, func(t *testing.T, env *Env) {
 		env.OpenFile("a/a1.go")
 		env.Await(

gopls/internal/regtest/watch_test.go

@@ -565,7 +565,7 @@ func main() {
 	blah.X()
 }
 `
-	withOptions(WithProxyFiles(proxy)).run(t, mod, func(t *testing.T, env *Env) {
+	withOptions(ProxyFiles(proxy)).run(t, mod, func(t *testing.T, env *Env) {
 		env.WriteWorkspaceFiles(map[string]string{
 			"go.mod": `module mod.com
 
@@ -611,7 +611,7 @@ func main() {
 `
 	withOptions(
 		InGOPATH(),
-		WithModes(Experimental), // module is in a subdirectory
+		Modes(Experimental), // module is in a subdirectory
 	).run(t, files, func(t *testing.T, env *Env) {
 		env.OpenFile("foo/main.go")
 		env.Await(env.DiagnosticAtRegexp("foo/main.go", `"blah"`))