qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-18 19:34:41 -07:00
Code Releases Activity

internal/lsp: fix nil pointer exception in document symbols

Browse Source 
Change-Id: I168bf7b995aa0b609de67999879addad250eff11
Reviewed-on: https://go-review.googlesource.com/c/tools/+/170006
Reviewed-by: Ian Cottrell <iancottrell@google.com>
This commit is contained in:
Rebecca Stambler 2019-03-29 13:46:33 -04:00
parent 23e29df326
commit 0926561711
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/lsp/source/symbols.go
View File

@ -46,15 +46,21 @@ func DocumentSymbols(ctx context.Context, f File) []Symbol {
for _, decl := range file.Decls {
switch decl := decl.(type) {
case *ast.FuncDecl:
symbols = append(symbols, funcSymbol(decl, info.ObjectOf(decl.Name), fset, q))
if obj := info.ObjectOf(decl.Name); obj != nil {
symbols = append(symbols, funcSymbol(decl, obj, fset, q))
}
case *ast.GenDecl:
for _, spec := range decl.Specs {
switch spec := spec.(type) {
case *ast.TypeSpec:
symbols = append(symbols, typeSymbol(spec, info.ObjectOf(spec.Name), fset, q))
if obj := info.ObjectOf(spec.Name); obj != nil {
symbols = append(symbols, typeSymbol(spec, obj, fset, q))
}
case *ast.ValueSpec:
for _, name := range spec.Names {
symbols = append(symbols, varSymbol(decl, name, info.ObjectOf(name), fset, q))
if obj := info.ObjectOf(name); obj != nil {
symbols = append(symbols, varSymbol(decl, name, obj, fset, q))
}
}
}
}