internal/lsp/source: add extra nil check in searchForEnclosing

stamblerre · stamblerre · commit df70183b1872 · 2020-07-29T04:18:21.000Z
I still keep seeing this crash too, even after CL 244841. Fixes golang/go#40464 Change-Id: Ic587045e65f34c24bd6df452e24517fd90e36bbe Reviewed-on: https://go-review.googlesource.com/c/tools/+/245440 Run-TryBot: Rebecca Stambler <rstambler@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Robert Findley <rfindley@google.com>
diff --git a/internal/lsp/source/identifier.go b/internal/lsp/source/identifier.go
@@ -248,6 +248,9 @@ func searchForEnclosing(info *types.Info, path []ast.Node) types.Type {
 						}
 					}
 				}
+				if exported == nil {
+					return nil
+				}
 				return exported
 			}
 		case *ast.CompositeLit:

Original file line number	Diff line number	Diff line change
`@@ -248,6 +248,9 @@ func searchForEnclosing(info *types.Info, path []ast.Node) types.Type {`
`248`	`248`	`}`
`249`	`249`	`}`
`250`	`250`	`}`
	`251`	`+ if exported == nil {`
	`252`	`+ return nil`
	`253`	`+ }`
`251`	`254`	`return exported`
`252`	`255`	`}`
`253`	`256`	`case *ast.CompositeLit:`