deps: upgrade to gopls and x/tools 323f198c (#580)

* internal/lsp: support implementations requests for implementations in other packages 323f198c
* go/packages: fix failing Windows TryBots for adhoc packages test dce577ff
* internal/lsp: handle the didChangeConfiguration message 74addff5
* internal/lsp: make View.SetOptions save and useful c41a8f58
* tools/gopls: add cmd support for folding_ranges a3f652f1
* internal/lsp/cache: avoid returning errors when building source.Errors 52adfe5c
* cmd/go-contrib-init: add unit test for the cmdErr function 9d59ce8a
* internal/testenv: reject the resolved 'go' command if it does not match runtime.GOROOT 7dd52f09
* internal/lsp/cache: have NewView create view even if load all packages fails 50fa39b7
* go/analysis/unitchecker: add erroras analysis to align with go vet 8cb0d021
* internal/lsp: support implements for methods on an interface a99edfee
* internal/lsp/protocol: define types in alphabetical order in tsprotocol.go 9f4e7946

cmd/govim/internal/golang_org_x_tools/lsp/cache/check.go

@@ -310,7 +310,8 @@ func typeCheck(ctx context.Context, fset *token.FileSet, m *metadata, mode sourc
 		for _, e := range rawErrors {
 			srcErr, err := sourceError(ctx, fset, pkg, e)
 			if err != nil {
-				return nil, err
+				log.Error(ctx, "unable to compute error positions", err, telemetry.Package.Of(pkg.ID()))
+				continue
 			}
 			pkg.errors = append(pkg.errors, srcErr)
 		}

cmd/govim/internal/golang_org_x_tools/lsp/cache/errors.go

@@ -12,7 +12,9 @@ import (
 	"golang.org/x/tools/go/packages"
 	"github.com/govim/govim/cmd/govim/internal/golang_org_x_tools/lsp/protocol"
 	"github.com/govim/govim/cmd/govim/internal/golang_org_x_tools/lsp/source"
+	"github.com/govim/govim/cmd/govim/internal/golang_org_x_tools/lsp/telemetry"
 	"github.com/govim/govim/cmd/govim/internal/golang_org_x_tools/span"
+	"github.com/govim/govim/cmd/govim/internal/golang_org_x_tools/telemetry/log"
 	errors "golang.org/x/xerrors"
 )
 
@@ -40,7 +42,8 @@ func sourceError(ctx context.Context, fset *token.FileSet, pkg *pkg, e interface
 		kind = source.ParseError
 		spn, err = scannerErrorRange(ctx, fset, pkg, e.Pos)
 		if err != nil {
-			return nil, err
+			log.Error(ctx, "no span for scanner.Error pos", err, telemetry.Package.Of(pkg.ID()))
+			spn = span.Parse(e.Pos.String())
 		}
 
 	case scanner.ErrorList:
@@ -52,9 +55,9 @@ func sourceError(ctx context.Context, fset *token.FileSet, pkg *pkg, e interface
 		kind = source.ParseError
 		spn, err = scannerErrorRange(ctx, fset, pkg, e[0].Pos)
 		if err != nil {
-			return nil, err
+			log.Error(ctx, "no span for scanner.Error pos", err, telemetry.Package.Of(pkg.ID()))
+			spn = span.Parse(e[0].Pos.String())
 		}
-
 	case types.Error:
 		msg = e.Msg
 		kind = source.TypeError

cmd/govim/internal/golang_org_x_tools/lsp/cache/load.go

@@ -64,10 +64,12 @@ func (s *snapshot) load(ctx context.Context, scope source.Scope) ([]*metadata, e
 		return nil, errors.Errorf("no metadata for %s: %v", uri, err)
 	}
 	log.Print(ctx, "go/packages.Load", tag.Of("packages", len(pkgs)))
-	if _, ok := scope.(source.FileURI); len(pkgs) == 0 && ok {
+	if len(pkgs) == 0 {
 		if err == nil {
 			err = errNoPackagesFound
 		}
+	}
+	if err != nil {
 		return nil, err
 	}
 	m, prevMissingImports, err := s.updateMetadata(ctx, scope, pkgs, cfg)

cmd/govim/internal/golang_org_x_tools/lsp/cache/session.go

@@ -6,6 +6,7 @@ package cache
 
 import (
 	"context"
+	"fmt"
 	"path/filepath"
 	"sort"
 	"strconv"
@@ -79,9 +80,20 @@ func (s *session) Cache() source.Cache {
 }
 
 func (s *session) NewView(ctx context.Context, name string, folder span.URI, options source.Options) (source.View, error) {
-	index := atomic.AddInt64(&viewIndex, 1)
 	s.viewMu.Lock()
 	defer s.viewMu.Unlock()
+	v, err := s.createView(ctx, name, folder, options)
+	if err != nil {
+		return nil, err
+	}
+	s.views = append(s.views, v)
+	// we always need to drop the view map
+	s.viewMap = make(map[span.URI]source.View)
+	return v, nil
+}
+
+func (s *session) createView(ctx context.Context, name string, folder span.URI, options source.Options) (*view, error) {
+	index := atomic.AddInt64(&viewIndex, 1)
 	// We want a true background context and not a detached context here
 	// the spans need to be unrelated and no tag values should pollute it.
 	baseCtx := trace.Detach(xcontext.Detach(ctx))
@@ -126,8 +138,9 @@ func (s *session) NewView(ctx context.Context, name string, folder span.URI, opt
 	v.snapshotMu.Lock()
 	defer v.snapshotMu.Unlock() // The code after the snapshot is used isn't expensive.
 	m, err := v.snapshot.load(ctx, source.DirectoryURI(folder))
+	var loadErr error
 	if err != nil && err != errNoPackagesFound {
-		return nil, err
+		loadErr = fmt.Errorf("Error loading packages: %v", err)
 	}
 
 	// Prepare CheckPackageHandles for every package that's been loaded.
@@ -139,12 +152,8 @@ func (s *session) NewView(ctx context.Context, name string, folder span.URI, opt
 			return nil, err
 		}
 	}
-
-	s.views = append(s.views, v)
-	// we always need to drop the view map
-	s.viewMap = make(map[span.URI]source.View)
 	debug.AddView(debugView{v})
-	return v, nil
+	return v, loadErr
 }
 
 // View returns the view by name.
@@ -221,20 +230,51 @@ func (s *session) bestView(uri span.URI) source.View {
 func (s *session) removeView(ctx context.Context, view *view) error {
 	s.viewMu.Lock()
 	defer s.viewMu.Unlock()
+	i, err := s.dropView(ctx, view)
+	if err != nil {
+		return err
+	}
+	// delete this view... we don't care about order but we do want to make
+	// sure we can garbage collect the view
+	s.views[i] = s.views[len(s.views)-1]
+	s.views[len(s.views)-1] = nil
+	s.views = s.views[:len(s.views)-1]
+	return nil
+}
+
+func (s *session) updateView(ctx context.Context, view *view, options source.Options) (*view, error) {
+	s.viewMu.Lock()
+	defer s.viewMu.Unlock()
+	i, err := s.dropView(ctx, view)
+	if err != nil {
+		return nil, err
+	}
+	v, err := s.createView(ctx, view.name, view.folder, options)
+	if err != nil {
+		// we have dropped the old view, but could not create the new one
+		// this should not happen and is very bad, but we still need to clean
+		// up the view array if it happens
+		s.views[i] = s.views[len(s.views)-1]
+		s.views[len(s.views)-1] = nil
+		s.views = s.views[:len(s.views)-1]
+	}
+	// substitute the new view into the array where the old view was
+	s.views[i] = v
+	return v, nil
+}
+
+func (s *session) dropView(ctx context.Context, view *view) (int, error) {
 	// we always need to drop the view map
 	s.viewMap = make(map[span.URI]source.View)
 	for i, v := range s.views {
 		if view == v {
-			// delete this view... we don't care about order but we do want to make
-			// sure we can garbage collect the view
-			s.views[i] = s.views[len(s.views)-1]
-			s.views[len(s.views)-1] = nil
-			s.views = s.views[:len(s.views)-1]
+			// we found the view, drop it and return the index it was found at
+			s.views[i] = nil
 			v.shutdown(ctx)
-			return nil
+			return i, nil
 		}
 	}
-	return errors.Errorf("view %s for %v not found", view.Name(), view.Folder())
+	return -1, errors.Errorf("view %s for %v not found", view.Name(), view.Folder())
 }
 
 // TODO: Propagate the language ID through to the view.

cmd/govim/internal/golang_org_x_tools/lsp/cache/snapshot.go

@@ -2,13 +2,15 @@ package cache
 
 import (
 	"context"
+	"fmt"
 	"os"
 	"sync"
 
 	"golang.org/x/tools/go/analysis"
 	"github.com/govim/govim/cmd/govim/internal/golang_org_x_tools/lsp/protocol"
 	"github.com/govim/govim/cmd/govim/internal/golang_org_x_tools/lsp/source"
 	"github.com/govim/govim/cmd/govim/internal/golang_org_x_tools/span"
+	"github.com/govim/govim/cmd/govim/internal/golang_org_x_tools/telemetry/log"
 )
 
 type snapshot struct {
@@ -98,6 +100,29 @@ func (s *snapshot) getPackages(uri source.FileURI, m source.ParseMode) (cphs []s
 	return cphs
 }
 
+func (s *snapshot) KnownPackages(ctx context.Context) []source.Package {
+	// TODO(matloob): This function exists because KnownImportPaths can't
+	// determine the import paths of all packages. Remove this function
+	// if KnownImportPaths gains that ability. That could happen if
+	// go list or go packages provide that information.
+	s.mu.Lock()
+	defer s.mu.Unlock()
+
+	var results []source.Package
+	for _, cph := range s.packages {
+		// Check the package now if it's not checked yet.
+		// TODO(matloob): is this too slow?
+		pkg, err := cph.check(ctx)
+		if err != nil {
+			log.Error(ctx, fmt.Sprintf("cph.Check of %v", cph.m.pkgPath), err)
+			continue
+		}
+		results = append(results, pkg)
+	}
+
+	return results
+}
+
 func (s *snapshot) KnownImportPaths() map[string]source.Package {
 	s.mu.Lock()
 	defer s.mu.Unlock()

cmd/govim/internal/golang_org_x_tools/lsp/cache/view.go

@@ -12,6 +12,7 @@ import (
 	"go/token"
 	"os"
 	"os/exec"
+	"reflect"
 	"strings"
 	"sync"
 	"time"
@@ -103,8 +104,26 @@ func (v *view) Options() source.Options {
 	return v.options
 }
 
-func (v *view) SetOptions(options source.Options) {
-	v.options = options
+func minorOptionsChange(a, b source.Options) bool {
+	// Check if any of the settings that modify our understanding of files have been changed
+	if !reflect.DeepEqual(a.Env, b.Env) {
+		return false
+	}
+	if !reflect.DeepEqual(a.BuildFlags, b.BuildFlags) {
+		return false
+	}
+	// the rest of the options are benign
+	return true
+}
+
+func (v *view) SetOptions(ctx context.Context, options source.Options) (source.View, error) {
+	// no need to rebuild the view if the options were not materially changed
+	if minorOptionsChange(v.options, options) {
+		v.options = options
+		return v, nil
+	}
+	newView, err := v.session.updateView(ctx, v, options)
+	return newView, err
 }
 
 // Config returns the configuration used for the view's interaction with the

cmd/govim/internal/golang_org_x_tools/lsp/cmd/cmd.go

@@ -142,6 +142,7 @@ func (app *Application) commands() []tool.Application {
 		&app.Serve,
 		&bug{},
 		&check{app: app},
+		&foldingRanges{app: app},
 		&format{app: app},
 		&links{app: app},
 		&imports{app: app},

cmd/govim/internal/golang_org_x_tools/lsp/cmd/folding_range.go

@@ -0,0 +1,72 @@
+// Copyright 2019 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package cmd
+
+import (
+	"context"
+	"flag"
+	"fmt"
+
+	"github.com/govim/govim/cmd/govim/internal/golang_org_x_tools/lsp/protocol"
+	"github.com/govim/govim/cmd/govim/internal/golang_org_x_tools/span"
+	"github.com/govim/govim/cmd/govim/internal/golang_org_x_tools/tool"
+)
+
+// foldingRanges implements the folding_ranges verb for gopls
+type foldingRanges struct {
+	app *Application
+}
+
+func (r *foldingRanges) Name() string      { return "folding_ranges" }
+func (r *foldingRanges) Usage() string     { return "<file>" }
+func (r *foldingRanges) ShortHelp() string { return "display selected file's folding ranges" }
+func (r *foldingRanges) DetailedHelp(f *flag.FlagSet) {
+	fmt.Fprint(f.Output(), `
+Example:
+
+  $ gopls folding_ranges helper/helper.go
+`)
+	f.PrintDefaults()
+}
+
+func (r *foldingRanges) Run(ctx context.Context, args ...string) error {
+	if len(args) != 1 {
+		return tool.CommandLineErrorf("folding_ranges expects 1 argument (file)")
+	}
+
+	conn, err := r.app.connect(ctx)
+	if err != nil {
+		return err
+	}
+	defer conn.terminate(ctx)
+
+	from := span.Parse(args[0])
+	file := conn.AddFile(ctx, from.URI())
+	if file.err != nil {
+		return file.err
+	}
+
+	p := protocol.FoldingRangeParams{
+		TextDocument: protocol.TextDocumentIdentifier{
+			URI: protocol.NewURI(from.URI()),
+		},
+	}
+
+	ranges, err := conn.FoldingRange(ctx, &p)
+	if err != nil {
+		return err
+	}
+
+	for _, r := range ranges {
+		fmt.Printf("%v:%v-%v:%v\n",
+			r.StartLine+1,
+			r.StartCharacter+1,
+			r.EndLine+1,
+			r.EndCharacter,
+		)
+	}
+
+	return nil
+}

cmd/govim/internal/golang_org_x_tools/lsp/cmd/test/cmdtest.go

@@ -65,10 +65,6 @@ func (r *runner) RankCompletion(t *testing.T, src span.Span, test tests.Completi
 	//TODO: add command line completions tests when it works
 }
 
-func (r *runner) FoldingRange(t *testing.T, spn span.Span) {
-	//TODO: add command line folding range tests when it works
-}
-
 func (r *runner) Highlight(t *testing.T, name string, locations []span.Span) {
 	//TODO: add command line highlight tests when it works
 }

cmd/govim/internal/golang_org_x_tools/lsp/cmd/test/folding_range.go

@@ -0,0 +1,32 @@
+package cmdtest
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/govim/govim/cmd/govim/internal/golang_org_x_tools/lsp/cmd"
+	"github.com/govim/govim/cmd/govim/internal/golang_org_x_tools/span"
+	"github.com/govim/govim/cmd/govim/internal/golang_org_x_tools/tool"
+)
+
+func (r *runner) FoldingRanges(t *testing.T, spn span.Span) {
+	goldenTag := "foldingRange-cmd"
+	uri := spn.URI()
+	filename := uri.Filename()
+
+	app := cmd.New("gopls-test", r.data.Config.Dir, r.data.Config.Env, r.options)
+	got := CaptureStdOut(t, func() {
+		err := tool.Run(r.ctx, app, append([]string{"-remote=internal", "folding_ranges"}, filename))
+		if err != nil {
+			fmt.Println(err)
+		}
+	})
+
+	expect := string(r.data.Golden(goldenTag, filename, func() ([]byte, error) {
+		return []byte(got), nil
+	}))
+
+	if expect != got {
+		t.Errorf("folding_ranges failed failed for %s expected:\n%s\ngot:\n%s", filename, expect, got)
+	}
+}