From 4fe688c6a49e59e852f0bfebbb4cf71366987ce7 Mon Sep 17 00:00:00 2001 From: David Symonds Date: Mon, 28 May 2018 13:03:08 +1000 Subject: [PATCH] cmd/cover: fix sorting of profile segment boundaries If a span of coverable code is empty (e.g. an empty select clause) then there will be two Boundary values with the same offset. In that case, the starting Boundary needs to come first so that the generated HTML output will open the tag before it tries to close it. Change-Id: Ib44a8b7c36ae57757c18b6cceb7a88ffa4e95394 Reviewed-on: https://go-review.googlesource.com/114855 Reviewed-by: Rob Pike Run-TryBot: Rob Pike TryBot-Result: Gobot Gobot --- src/cmd/cover/profile.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/cmd/cover/profile.go b/src/cmd/cover/profile.go index 5628b91f51..0da42ebfd3 100644 --- a/src/cmd/cover/profile.go +++ b/src/cmd/cover/profile.go @@ -174,7 +174,7 @@ func (p *Profile) Boundaries(src []byte) (boundaries []Boundary) { return b } if max <= 1 { - b.Norm = 0.8 // Profile is in"set" mode; we want a heat map. Use cov8 in the CSS. + b.Norm = 0.8 // Profile is in "set" mode; we want a heat map. Use cov8 in the CSS. } else if count > 0 { b.Norm = math.Log(float64(count)) / divisor } @@ -209,7 +209,10 @@ func (b boundariesByPos) Len() int { return len(b) } func (b boundariesByPos) Swap(i, j int) { b[i], b[j] = b[j], b[i] } func (b boundariesByPos) Less(i, j int) bool { if b[i].Offset == b[j].Offset { - return !b[i].Start && b[j].Start + // Boundaries at the same offset should be ordered Start < !Start. + // They represent empty sections of code (e.g. a switch/select clause + // without a body). + return b[i].Start && !b[j].Start } return b[i].Offset < b[j].Offset } -- 2.50.0