[tools] Revert "internal/lsp/cache: disable GOPACKAGESDRIVER"

7 views

Skip to first unread message

Heschi Kreinick (Gerrit)

unread,

Apr 6, 2021, 3:05:34 PM4/6/21

to Gerrit Bot, goph...@pubsubhelper.golang.org, golang-...@googlegroups.com, Steeve Morin, Brandon Bennett, Go Bot, kokoro, Rebecca Stambler, golang-co...@googlegroups.com

Heschi Kreinick submitted this change.

View Change

Approvals:
  Rebecca Stambler: Looks good to me, approved; Trusted; Run TryBots
  Heschi Kreinick: Looks good to me, approved
  Go Bot: TryBots succeeded
  kokoro: gopls CI succeeded

Revert "internal/lsp/cache: disable GOPACKAGESDRIVER"

Now that https://github.com/bazelbuild/rules_go has a working prototype of a `GOPACKAGESDRIVER`, it may be time to revert that commit.

The draft implementation is at https://github.com/bazelbuild/rules_go/pull/2858.

Change-Id: Ia738e8be448d936f8a3b2b421d0a765f94bbff52
GitHub-Last-Rev: 0df6c91074febdddb5703a39591090acb5f42c05
GitHub-Pull-Request: golang/tools#297
Reviewed-on: https://go-review.googlesource.com/c/tools/+/307169
Reviewed-by: Rebecca Stambler <rsta...@golang.org>
Reviewed-by: Heschi Kreinick <hes...@google.com>
Trust: Rebecca Stambler <rsta...@golang.org>
Run-TryBot: Rebecca Stambler <rsta...@golang.org>
gopls-CI: kokoro <noreply...@google.com>
TryBot-Result: Go Bot <go...@golang.org>
---
M internal/lsp/cache/snapshot.go
1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/internal/lsp/cache/snapshot.go b/internal/lsp/cache/snapshot.go
index 8a6f066..28d0449 100644
--- a/internal/lsp/cache/snapshot.go
+++ b/internal/lsp/cache/snapshot.go
@@ -200,14 +200,10 @@
 	verboseOutput := s.view.options.VerboseOutput
 	s.view.optionsMu.Unlock()
 
-	// Forcibly disable GOPACKAGESDRIVER. It's incompatible with the
-	// packagesinternal APIs we use, and we really only support the go command
-	// anyway.
-	env := append(append([]string{}, inv.Env...), "GOPACKAGESDRIVER=off")
 	cfg := &packages.Config{
 		Context:    ctx,
 		Dir:        inv.WorkingDir,
-		Env:        env,
+		Env:        inv.Env,
 		BuildFlags: inv.BuildFlags,
 		Mode: packages.NeedName |
 			packages.NeedFiles |

To view, visit change 307169. To unsubscribe, or for help writing mail filters, visit settings.

Reply all

Reply to author

Forward

0 new messages