commit | 43c5e4ca5b1012c595e579f7306906c5aba61e36 | [log] [tgz] |
---|---|---|
author | Rebecca Stambler <rstambler@golang.org> | Fri Aug 02 10:46:19 2019 -0400 |
committer | Rebecca Stambler <rstambler@golang.org> | Fri Aug 02 20:08:13 2019 +0000 |
tree | ad1dd62f8e4dac454a20ccd7a64cd74c652089d6 | |
parent | e9bb7d36c0606a2c422dffe30db7d628ebeb9302 [diff] |
internal/lsp: handle potential nil pointers in GetToken Change-Id: Icd24c7c717099209f246fd4c0d5dc2e424613962 Reviewed-on: https://go-review.googlesource.com/c/tools/+/188757 Reviewed-by: Suzy Mueller <suzmue@golang.org>
diff --git a/internal/lsp/cache/gofile.go b/internal/lsp/cache/gofile.go index a347a67..a376853 100644 --- a/internal/lsp/cache/gofile.go +++ b/internal/lsp/cache/gofile.go
@@ -53,7 +53,11 @@ if file == nil { return nil, err } - return f.view.session.cache.fset.File(file.Pos()), nil + tok := f.view.session.cache.fset.File(file.Pos()) + if tok == nil { + return nil, fmt.Errorf("no token.File for %s", f.URI()) + } + return tok, nil } func (f *goFile) GetAST(ctx context.Context, mode source.ParseMode) (*ast.File, error) {