Skip to content

Commit a46736d

Browse files
committed
internal/lsp/source: handle possible nil pointer in rename check
Change-Id: I92cc4015361d40e8a10d05fa6857bee2b302cec4 Reviewed-on: https://go-review.googlesource.com/c/tools/+/284583 Trust: Rebecca Stambler <[email protected]> Run-TryBot: Rebecca Stambler <[email protected]> gopls-CI: kokoro <[email protected]> TryBot-Result: Go Bot <[email protected]> Reviewed-by: Heschi Kreinick <[email protected]>
1 parent e0d2015 commit a46736d

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

internal/lsp/source/rename_check.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -894,6 +894,9 @@ func tokenFileContainsPos(f *token.File, pos token.Pos) bool {
894894
}
895895

896896
func objectKind(obj types.Object) string {
897+
if obj == nil {
898+
return "nil object"
899+
}
897900
switch obj := obj.(type) {
898901
case *types.PkgName:
899902
return "imported package name"
@@ -937,6 +940,9 @@ func isLocal(obj types.Object) bool {
937940
}
938941

939942
func isPackageLevel(obj types.Object) bool {
943+
if obj == nil {
944+
return false
945+
}
940946
return obj.Pkg().Scope().Lookup(obj.Name()) == obj
941947
}
942948

0 commit comments

Comments
 (0)