cybercyst/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-05-05 15:43:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

internal/lsp/cache: avoid returning errors when building source.Errors

Browse Source 
We don't want to return an error for the whole package when we are just
building out error positions.

Change-Id: I56b5b88ff2b4b44da8a372ade81cd9b1534235c4
Reviewed-on: https://go-review.googlesource.com/c/tools/+/206597
Reviewed-by: Heschi Kreinick <heschi@google.com>
Run-TryBot: Heschi Kreinick <heschi@google.com>
This commit is contained in:
Rebecca Stambler 2019-11-11 18:27:04 -05:00
parent 9d59ce8a7f
commit 52adfe5cb6
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/lsp/cache/check.go vendored
View File

@ -310,7 +310,8 @@ func typeCheck(ctx context.Context, fset *token.FileSet, m *metadata, mode sourc
for _, e := range rawErrors { for _, e := range rawErrors {
srcErr, err := sourceError(ctx, fset, pkg, e) srcErr, err := sourceError(ctx, fset, pkg, e)
if err != nil { if err != nil {
return nil, err log.Error(ctx, "unable to compute error positions", err, telemetry.Package.Of(pkg.ID()))
continue
} }
pkg.errors = append(pkg.errors, srcErr) pkg.errors = append(pkg.errors, srcErr)
} }

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

@ -12,7 +12,9 @@ import (
"golang.org/x/tools/go/packages" "golang.org/x/tools/go/packages"
"golang.org/x/tools/internal/lsp/protocol" "golang.org/x/tools/internal/lsp/protocol"
"golang.org/x/tools/internal/lsp/source" "golang.org/x/tools/internal/lsp/source"
"golang.org/x/tools/internal/lsp/telemetry"
"golang.org/x/tools/internal/span" "golang.org/x/tools/internal/span"
"golang.org/x/tools/internal/telemetry/log"
errors "golang.org/x/xerrors" errors "golang.org/x/xerrors"
) )
@ -40,7 +42,8 @@ func sourceError(ctx context.Context, fset *token.FileSet, pkg *pkg, e interface
kind = source.ParseError kind = source.ParseError
spn, err = scannerErrorRange(ctx, fset, pkg, e.Pos) spn, err = scannerErrorRange(ctx, fset, pkg, e.Pos)
if err != nil { if err != nil {
return nil, err log.Error(ctx, "no span for scanner.Error pos", err, telemetry.Package.Of(pkg.ID()))
spn = span.Parse(e.Pos.String())
} }
case scanner.ErrorList: case scanner.ErrorList:
@ -52,9 +55,9 @@ func sourceError(ctx context.Context, fset *token.FileSet, pkg *pkg, e interface
kind = source.ParseError kind = source.ParseError
spn, err = scannerErrorRange(ctx, fset, pkg, e[0].Pos) spn, err = scannerErrorRange(ctx, fset, pkg, e[0].Pos)
if err != nil { if err != nil {
return nil, err log.Error(ctx, "no span for scanner.Error pos", err, telemetry.Package.Of(pkg.ID()))
spn = span.Parse(e[0].Pos.String())
} }
case types.Error: case types.Error:
msg = e.Msg msg = e.Msg
kind = source.TypeError kind = source.TypeError