From bc369361f3bccd29e0e419a6ab00f2a53e8f9805 Mon Sep 17 00:00:00 2001 From: Rebecca Stambler Date: Fri, 6 Dec 2019 15:15:20 -0500 Subject: [PATCH] internal/lsp: fix error suppression in (*session).createView I had mistakenly forgotten to return a snapshot along with the view. Fixes golang/go#36020 Change-Id: I1fc802b8924fccec1d6aaa110640eaed490c3aa1 Reviewed-on: https://go-review.googlesource.com/c/tools/+/210215 Run-TryBot: Rebecca Stambler Reviewed-by: Heschi Kreinick TryBot-Result: Gobot Gobot --- internal/lsp/cache/session.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/lsp/cache/session.go b/internal/lsp/cache/session.go index ccc24b6520..7beb610e2a 100644 --- a/internal/lsp/cache/session.go +++ b/internal/lsp/cache/session.go @@ -137,7 +137,7 @@ func (s *session) createView(ctx context.Context, name string, folder span.URI, if err != nil { // Suppress all errors. log.Error(ctx, "failed to load snapshot", err, telemetry.Directory.Of(folder)) - return v, nil, nil + return v, v.snapshot, nil } // Prepare CheckPackageHandles for every package that's been loaded. // (*snapshot).CheckPackageHandle makes the assumption that every package that's @@ -145,7 +145,7 @@ func (s *session) createView(ctx context.Context, name string, folder span.URI, if _, err := v.snapshot.checkWorkspacePackages(ctx, m); err != nil { // Suppress all errors. log.Error(ctx, "failed to check snapshot", err, telemetry.Directory.Of(folder)) - return v, nil, nil + return v, v.snapshot, nil } debug.AddView(debugView{v})