Merge 0a0f0d7 into 2702523

Author: Henry Wong

internal/lsp/cache/load.go

@@ -16,6 +16,7 @@ import (
 	"golang.org/x/tools/internal/lsp/telemetry/trace"
 	"golang.org/x/tools/internal/span"
 	errors "golang.org/x/xerrors"
+	"path/filepath"
 )
 
 func (v *view) loadParseTypecheck(ctx context.Context, f *goFile) ([]packages.Error, error) {
@@ -91,7 +92,7 @@ func (v *view) checkMetadata(ctx context.Context, f *goFile) (map[packageID]*met
 
 	ctx, done := trace.StartSpan(ctx, "packages.Load", telemetry.File.Of(f.filename()))
 	defer done()
-	pkgs, err := packages.Load(v.Config(ctx), fmt.Sprintf("file=%s", f.filename()))
+	pkgs, err := loadPackages(ctx, f, v)
 	if len(pkgs) == 0 {
 		if err == nil {
 			err = errors.Errorf("go/packages.Load: no packages found for %s", f.filename())
@@ -106,7 +107,6 @@ func (v *view) checkMetadata(ctx context.Context, f *goFile) (map[packageID]*met
 	}
 	// Track missing imports as we look at the package's errors.
 	missingImports := make(map[packagePath]struct{})
-
 	log.Print(ctx, "go/packages.Load", tag.Of("packages", len(pkgs)))
 	for _, pkg := range pkgs {
 		log.Print(ctx, "go/packages.Load", tag.Of("package", pkg.PkgPath), tag.Of("files", pkg.CompiledGoFiles))
@@ -301,3 +301,22 @@ func filenamesIdentical(oldFiles, newFiles []string) bool {
 	}
 	return len(oldByName) == 0
 }
+
+func loadPackages(ctx context.Context, f *goFile, v *view) ([]*packages.Package, error) {
+	go111Module := false
+	for i := range v.env {
+		if v.env[len(v.env)-i-1] == "GO111MODULE=off" {
+			go111Module = true
+			break
+		}
+	}
+	if go111Module {
+		if dir, err := filepath.Rel(v.folder.Filename(), filepath.Dir(f.filename())); err != nil {
+			return packages.Load(v.Config(ctx), fmt.Sprintf("file=%s", f.filename()))
+		} else {
+			return packages.Load(v.Config(ctx), fmt.Sprintf("pattern=%s", "."+string(filepath.Separator)+dir))
+		}
+	} else {
+		return packages.Load(v.Config(ctx), fmt.Sprintf("file=%s", f.filename()))
+	}
+}

internal/lsp/cache/session.go

@@ -93,6 +93,12 @@ func (s *session) NewView(ctx context.Context, name string, folder span.URI) sou
 		},
 		ignoredURIs: make(map[span.URI]struct{}),
 	}
+
+	// Setting 'GO111MODULE=off' by default. 'GO111MODULE=off' is inconsistent with module mode, this will disable
+	// the deps download.
+	// TODO(henrywong) Use 'GOPROXY=off' to disable the network access
+	v.env = append(v.env, "GO111MODULE=off")
+
 	// Preemptively build the builtin package,
 	// so we immediately add builtin.go to the list of ignored files.
 	v.buildBuiltinPkg(ctx)

internal/lsp/elasticserver.go

@@ -189,10 +189,8 @@ type WorkspaceFolderMeta struct {
 // manageDeps will try its best to convert the folders to modules. The core functions, like deps downloading and deps
 // management, will be implemented in the package 'cache'.
 func (s ElasticServer) ManageDeps(folders *[]protocol.WorkspaceFolder) error {
-	// Note: For the upstream go langserver, granularity of the workspace folders is repository. But for the elastic go
-	// language server, there are repositories contain multiple modules. In order to handle the modules separately, we
-	// consider different modules as different workspace folders, so we can manage the dependency of different modules
-	// separately.
+	// In order to handle the modules separately, we consider different modules as different workspace folders, so we
+	// can manage the dependency of different modules separately.
 	for _, folder := range *folders {
 		metadata := &WorkspaceFolderMeta{}
 		if folder.URI != "" {

internal/lsp/general.go

@@ -9,6 +9,7 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"os/exec"
 	"path"
 
 	"golang.org/x/tools/internal/jsonrpc2"
@@ -32,12 +33,16 @@ func (s *Server) initialize(ctx context.Context, params *protocol.InitializePara
 	s.state = serverInitializing
 	s.stateMu.Unlock()
 
+	installGoDependency := false
 	// TODO: Remove the option once we are certain there are no issues here.
 	s.textDocumentSyncKind = protocol.Incremental
 	if opts, ok := params.InitializationOptions.(map[string]interface{}); ok {
 		if opt, ok := opts["noIncrementalSync"].(bool); ok && opt {
 			s.textDocumentSyncKind = protocol.Full
 		}
+		if opt, ok := opts["installGoDependency"].(bool); ok && opt {
+			installGoDependency = true
+		}
 	}
 
 	// Default to using synopsis as a default for hover information.
@@ -73,6 +78,13 @@ func (s *Server) initialize(ctx context.Context, params *protocol.InitializePara
 		if err := s.addView(ctx, folder.Name, span.NewURI(folder.URI)); err != nil {
 			return nil, err
 		}
+		if installGoDependency {
+			cmd := exec.Command("go", "mod", "download")
+			cmd.Dir = span.NewURI(folder.URI).Filename()
+			if err := cmd.Run(); err != nil {
+				log.Error(ctx, "failed to download the dependencies", err)
+			}
+		}
 	}
 	return &protocol.InitializeResult{
 		Capabilities: protocol.ServerCapabilities{