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

internal/lsp: don't require type-checking for formatting 

We had previously required a type-checked package for formatting
requests, in order to determine if the package contained any parse
errors. We can get this information directly from the ParseGoHandle, so
there is no need to check the package. This will prevent `go list`
errors from making their way into formatting requests, for which a `go
list` really is not needed.

Updates golang/go#36511

Change-Id: I297f8880367e800d2343f468535efa80d2937071
Reviewed-on: https://go-review.googlesource.com/c/tools/+/214421
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-12 18:14:55 -05:00
parent 86d412b4c6
commit 6316571e2c
1 changed files with 6 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
internal/lsp/source/format.go
View File

@ -8,7 +8,6 @@ package source
import (
"bytes"
"context"
"fmt"
"go/ast"
"go/format"
"go/parser"
@ -28,25 +27,15 @@ func Format(ctx context.Context, snapshot Snapshot, fh FileHandle) ([]protocol.T
ctx, done := trace.StartSpan(ctx, "source.Format")
defer done()
pkg, pgh, err := getParsedFile(ctx, snapshot, fh, NarrowestCheckPackageHandle)
if err != nil {
return nil, fmt.Errorf("getting file for Format: %v", err)
}
// Be extra careful that the file's ParseMode is correct,
// otherwise we might replace the user's code with a trimmed AST.
if pgh.Mode() != ParseFull {
return nil, errors.Errorf("%s was parsed in the incorrect mode", pgh.File().Identity().URI)
}
file, m, _, err := pgh.Parse(ctx)
pgh := snapshot.View().Session().Cache().ParseGoHandle(fh, ParseFull)
file, m, parseErrors, err := pgh.Parse(ctx)
if err != nil {
return nil, err
}
if hasListErrors(pkg) || hasParseErrors(pkg, fh.Identity().URI) {
// Even if this package has list or parse errors, this file may not
// have any parse errors and can still be formatted. Using format.Node
// on an ast with errors may result in code being added or removed.
// Attempt to format the source of this file instead.
// Even if this file has parse errors, it might still be possible to format it.
// Using format.Node on an AST with errors may result in code being modified.
// Attempt to format the source of this file instead.
if parseErrors != nil {
formatted, err := formatSource(ctx, snapshot, fh)
if err != nil {
return nil, err
@ -303,16 +292,6 @@ func trimToFirstNonImport(fset *token.FileSet, f *ast.File, src []byte, err erro
return src[0:fset.Position(end).Offset], true
}
// hasParseErrors returns true if the given file has parse errors.
func hasParseErrors(pkg Package, uri span.URI) bool {
for _, e := range pkg.GetErrors() {
if e.File.URI == uri && e.Kind == ParseError {
return true
}
}
return false
}
func hasListErrors(pkg Package) bool {
for _, err := range pkg.GetErrors() {
if err.Kind == ListError {