internal/lsp: fix no definition when importShortcut is link

Fixes golang/go#45987 Change-Id: I59194f41eccdd3a0df6d9a3d0cc57008c40b1450 GitHub-Last-Rev: 832d6f8 GitHub-Pull-Request: golang#317 Reviewed-on: https://go-review.googlesource.com/c/tools/+/318469 Reviewed-by: Rebecca Stambler <[email protected]> Trust: Rebecca Stambler <[email protected]> Trust: Suzy Mueller <[email protected]>
daveset · May 10, 2021 · 0185c7e · 0185c7e
1 parent ecb7392
commit 0185c7e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/internal/lsp/definition.go b/internal/lsp/definition.go
@@ -26,7 +26,7 @@ func (s *Server) definition(ctx context.Context, params *protocol.DefinitionPara
 	if err != nil {
 		return nil, err
 	}
-	if !snapshot.View().Options().ImportShortcut.ShowDefinition() {
+	if ident.IsImport() && !snapshot.View().Options().ImportShortcut.ShowDefinition() {
 		return nil, nil
 	}
 	var locations []protocol.Location

diff --git a/internal/lsp/source/identifier.go b/internal/lsp/source/identifier.go
@@ -41,6 +41,11 @@ type IdentifierInfo struct {
 	qf  types.Qualifier
 }
 
+func (i *IdentifierInfo) IsImport() bool {
+	_, ok := i.Declaration.node.(*ast.ImportSpec)
+	return ok
+}
+
 type Declaration struct {
 	MappedRange []MappedRange
 	node        ast.Node