Upgrade golang-x-tools to v0.7.0HEADmastermain

Not using external_updater this time to switch to the new upstream tags.

Test: treehugger
Change-Id: I31488b4958a366ed7f183bb387d3e1446acc13ae

1 files changed, 52 insertions, 0 deletions

diff --git a/gopls/internal/lsp/definition.go b/gopls/internal/lsp/definition.go
new file mode 100644
index 000000000..6259d4dbb
--- /dev/null
+++ b/gopls/internal/lsp/definition.go
@@ -0,0 +1,52 @@
+// 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 lsp
+
+import (
+	"context"
+	"errors"
+	"fmt"
+
+	"golang.org/x/tools/gopls/internal/lsp/protocol"
+	"golang.org/x/tools/gopls/internal/lsp/source"
+	"golang.org/x/tools/gopls/internal/lsp/template"
+)
+
+func (s *Server) definition(ctx context.Context, params *protocol.DefinitionParams) ([]protocol.Location, error) {
+	// TODO(rfindley): definition requests should be multiplexed across all views.
+	snapshot, fh, ok, release, err := s.beginFileRequest(ctx, params.TextDocument.URI, source.UnknownKind)
+	defer release()
+	if !ok {
+		return nil, err
+	}
+	switch kind := snapshot.View().FileKind(fh); kind {
+	case source.Tmpl:
+		return template.Definition(snapshot, fh, params.Position)
+	case source.Go:
+		// Partial support for jumping from linkname directive (position at 2nd argument).
+		locations, err := source.LinknameDefinition(ctx, snapshot, fh, params.Position)
+		if !errors.Is(err, source.ErrNoLinkname) {
+			return locations, err
+		}
+		return source.Definition(ctx, snapshot, fh, params.Position)
+	default:
+		return nil, fmt.Errorf("can't find definitions for file type %s", kind)
+	}
+}
+
+func (s *Server) typeDefinition(ctx context.Context, params *protocol.TypeDefinitionParams) ([]protocol.Location, error) {
+	// TODO(rfindley): type definition requests should be multiplexed across all views.
+	snapshot, fh, ok, release, err := s.beginFileRequest(ctx, params.TextDocument.URI, source.Go)
+	defer release()
+	if !ok {
+		return nil, err
+	}
+	switch kind := snapshot.View().FileKind(fh); kind {
+	case source.Go:
+		return source.TypeDefinition(ctx, snapshot, fh, params.Position)
+	default:
+		return nil, fmt.Errorf("can't find type definitions for file type %s", kind)
+	}
+}