From e7a17c4c1366742d0088bef9c9c056bfdd1ce0dd Mon Sep 17 00:00:00 2001 From: Heschi Kreinick Date: Thu, 29 Oct 2020 13:59:03 -0400 Subject: [PATCH] internal/lsp/cache: preserve OS environment In https://golang.org/cl/265237 I accidentally lost the os.Environ() call, so we weren't using the OS environment as the defaults any more. Change-Id: Id36e3c04f3c13d512b0b71b8d73ed086d9ee9f1d Reviewed-on: https://go-review.googlesource.com/c/tools/+/266337 Trust: Heschi Kreinick Run-TryBot: Heschi Kreinick Reviewed-by: Rebecca Stambler gopls-CI: kokoro TryBot-Result: Go Bot --- internal/lsp/cache/snapshot.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/lsp/cache/snapshot.go b/internal/lsp/cache/snapshot.go index 27b8ba1909..f26772ec2c 100644 --- a/internal/lsp/cache/snapshot.go +++ b/internal/lsp/cache/snapshot.go @@ -242,7 +242,7 @@ func (s *snapshot) RunGoCommandPiped(ctx context.Context, mode source.Invocation func (s *snapshot) goCommandInvocation(ctx context.Context, mode source.InvocationMode, inv *gocommand.Invocation) (tmpURI span.URI, updatedInv *gocommand.Invocation, cleanup func(), err error) { s.view.optionsMu.Lock() - inv.Env = append(append(append([]string{}, s.view.options.EnvSlice()...), inv.Env...), "GO111MODULE="+s.view.go111module) + inv.Env = append(append(append(os.Environ(), s.view.options.EnvSlice()...), inv.Env...), "GO111MODULE="+s.view.go111module) inv.BuildFlags = append([]string{}, s.view.options.BuildFlags...) s.view.optionsMu.Unlock() cleanup = func() {} // fallback