internal/lsp/source: handle nil pointer in package name hover

stamblerre · stamblerre · commit 8b0f8a79195e · 2020-05-11T19:44:01.000Z
Updates golang/go#38977. Change-Id: I8cbf0b058d77e749285cfe41b4b49de3764be861 Reviewed-on: https://go-review.googlesource.com/c/tools/+/233177 Run-TryBot: Rebecca Stambler <rstambler@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Heschi Kreinick <heschi@google.com>
diff --git a/internal/lsp/source/identifier.go b/internal/lsp/source/identifier.go
@@ -103,6 +103,10 @@ func findIdentifier(ctx context.Context, s Snapshot, pkg Package, file *ast.File
 				declAST = f
 			}
 		}
+		// If there's no package documentation, just use current file.
+		if declAST == nil {
+			declAST = file
+		}
 		declRng, err := posToMappedRange(view, pkg, declAST.Name.Pos(), declAST.Name.End())
 		if err != nil {
 			return nil, err

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,10 @@ func findIdentifier(ctx context.Context, s Snapshot, pkg Package, file *ast.File`
`103`	`103`	`declAST = f`
`104`	`104`	`}`
`105`	`105`	`}`
	`106`	`+ // If there's no package documentation, just use current file.`
	`107`	`+ if declAST == nil {`
	`108`	`+ declAST = file`
	`109`	`+ }`
`106`	`110`	`declRng, err := posToMappedRange(view, pkg, declAST.Name.Pos(), declAST.Name.End())`
`107`	`111`	`if err != nil {`
`108`	`112`	`return nil, err`