Commit 84540f0b authored by Tobias Klauser's avatar Tobias Klauser Committed by Brad Fitzpatrick

cmd/compile/internal/logopt: gofmt

Change-Id: Ie9d29645e7702104202ee1f338babdd9e33e1e58
Reviewed-on: https://go-review.googlesource.com/c/go/+/210679
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: default avatarBrad Fitzpatrick <bradfitz@golang.org>
parent 207a0b79
...@@ -321,12 +321,14 @@ func Enabled() bool { ...@@ -321,12 +321,14 @@ func Enabled() bool {
// byPos sorts diagnostics by source position. // byPos sorts diagnostics by source position.
type byPos struct { type byPos struct {
ctxt *obj.Link ctxt *obj.Link
a []LoggedOpt a []LoggedOpt
} }
func (x byPos) Len() int { return len(x.a) } func (x byPos) Len() int { return len(x.a) }
func (x byPos) Less(i, j int) bool { return x.ctxt.OutermostPos(x.a[i].pos).Before(x.ctxt.OutermostPos(x.a[j].pos)) } func (x byPos) Less(i, j int) bool {
func (x byPos) Swap(i, j int) { x.a[i], x.a[j] = x.a[j], x.a[i] } return x.ctxt.OutermostPos(x.a[i].pos).Before(x.ctxt.OutermostPos(x.a[j].pos))
}
func (x byPos) Swap(i, j int) { x.a[i], x.a[j] = x.a[j], x.a[i] }
func writerForLSP(subdirpath, file string) io.WriteCloser { func writerForLSP(subdirpath, file string) io.WriteCloser {
basename := file basename := file
...@@ -367,7 +369,7 @@ func uriIfy(f string) DocumentURI { ...@@ -367,7 +369,7 @@ func uriIfy(f string) DocumentURI {
// Return filename, replacing a first occurrence of $GOROOT with the // Return filename, replacing a first occurrence of $GOROOT with the
// actual value of the GOROOT (because LSP does not speak "$GOROOT"). // actual value of the GOROOT (because LSP does not speak "$GOROOT").
func uprootedPath(filename string) string { func uprootedPath(filename string) string {
if ! strings.HasPrefix(filename, "$GOROOT/") { if !strings.HasPrefix(filename, "$GOROOT/") {
return filename return filename
} }
return objabi.GOROOT + filename[len("$GOROOT"):] return objabi.GOROOT + filename[len("$GOROOT"):]
...@@ -379,7 +381,7 @@ func FlushLoggedOpts(ctxt *obj.Link, slashPkgPath string) { ...@@ -379,7 +381,7 @@ func FlushLoggedOpts(ctxt *obj.Link, slashPkgPath string) {
return return
} }
sort.Stable(byPos{ctxt,loggedOpts}) // Stable is necessary to preserve the per-function order, which is repeatable. sort.Stable(byPos{ctxt, loggedOpts}) // Stable is necessary to preserve the per-function order, which is repeatable.
switch Format { switch Format {
case Json0: // LSP 3.15 case Json0: // LSP 3.15
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment