internal/lsp/cache: don't set tempModFile is view's modURI is empty

stamblerre · stamblerre · commit 8a9a89368bd3 · 2020-09-24T20:59:11.000Z
This fixes panics caused by us thinking that we should use tempModFile without a go.mod in the view. This code will likely go away after view.modURI is deleted. Change-Id: I77a9c9f62bcac27cafa69eb970e004dd58d29d07 Reviewed-on: https://go-review.googlesource.com/c/tools/+/257201 Trust: Rebecca Stambler <rstambler@golang.org> Run-TryBot: Rebecca Stambler <rstambler@golang.org> Reviewed-by: Robert Findley <rfindley@google.com> gopls-CI: kokoro <noreply+kokoro@google.com> TryBot-Result: Go Bot <gobot@golang.org>
diff --git a/internal/lsp/cache/view.go b/internal/lsp/cache/view.go
@@ -1069,7 +1069,7 @@ func determineWorkspaceMode(options *source.Options, validBuildConfiguration boo
 		mode |= moduleMode
 	}
 	// The -modfile flag is available for Go versions >= 1.14.
-	if options.TempModfile && ws.goversion >= 14 {
+	if ws.modURI != "" && options.TempModfile && ws.goversion >= 14 {
 		mode |= tempModfile
 	}
 	// Don't default to multi-workspace mode if one of the modules contains a

Original file line number	Diff line number	Diff line change
`@@ -1069,7 +1069,7 @@ func determineWorkspaceMode(options *source.Options, validBuildConfiguration boo`
`1069`	`1069`	`mode \|= moduleMode`
`1070`	`1070`	`}`
`1071`	`1071`	`// The -modfile flag is available for Go versions >= 1.14.`
`1072`		`- if options.TempModfile && ws.goversion >= 14 {`
	`1072`	`+ if ws.modURI != "" && options.TempModfile && ws.goversion >= 14 {`
`1073`	`1073`	`mode \|= tempModfile`
`1074`	`1074`	`}`
`1075`	`1075`	`// Don't default to multi-workspace mode if one of the modules contains a`