mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

internal/lsp: fix context cancellation 

Change-Id: Ib932722b0e66910b8cd23031e756f16099ee82dc
Reviewed-on: https://go-review.googlesource.com/c/tools/+/214581
Run-TryBot: Rebecca Stambler <rstambler@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Heschi Kreinick <heschi@google.com>
This commit is contained in:
Rebecca Stambler 2020-01-13 17:05:54 -05:00
parent 294c8f8251
commit 3b9e235283
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
internal/lsp/cache/load.go vendored
View File

@ -66,10 +66,11 @@ func (s *snapshot) load(ctx context.Context, scope interface{}) ([]*metadata, er
cfg := s.view.Config(ctx)
pkgs, err := packages.Load(cfg, query)
// If the context was canceled, return early.
// Otherwise, we might be type-checking an incomplete result.
if err == context.Canceled {
return nil, err
// If the context was canceled, return early. Otherwise, we might be
// type-checking an incomplete result. Check the context directly,
// because go/packages adds extra information to the error.
if ctx.Err() != nil {
return nil, ctx.Err()
}
log.Print(ctx, "go/packages.Load", tag.Of("query", query), tag.Of("packages", len(pkgs)))

3
internal/lsp/source/diagnostics.go
View File

@ -117,6 +117,9 @@ func PackageDiagnostics(ctx context.Context, snapshot Snapshot, ph PackageHandle
// Updates to the diagnostics for this package may need to be propagated.
reverseDeps, err := snapshot.GetReverseDependencies(ctx, pkg.ID())
if err != nil {
if err == context.Canceled {
return nil, warningMsg, err
}
log.Error(ctx, "no reverse dependencies", err)
return reports, warningMsg, nil
}