-
-
Notifications
You must be signed in to change notification settings - Fork 14
/
Copy pathcovet.go
285 lines (263 loc) · 8.25 KB
/
covet.go
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
// Package covet reads version control diffs and Go coverage files to generate reports on their intersection.
package covet
import (
"fmt"
"io"
"io/fs"
"math"
"path"
"sort"
"strings"
"github.com/bluekeyes/go-gitdiff/gitdiff"
"github.com/fatih/color"
"github.com/hack-pad/hackpadfs"
"github.com/johnstarich/go/covet/internal/fspath"
"github.com/johnstarich/go/covet/internal/packages"
"github.com/johnstarich/go/covet/internal/span"
"github.com/pkg/errors"
"golang.org/x/tools/cover"
)
// Covet generates reports for a diff and coverage combination
type Covet struct {
options Options
addedLines,
coveredLines,
uncoveredLines map[string][]span.Span
}
// Options contains parse options
type Options struct {
// FS is the file system to read files, Go package information, and more.
// Defaults to hackpadfs's os.NewFS(). If on Windows, the default targets the current working directory's volume (e.g. C:\).
FS fs.FS
// Diff is a reader with patch or diff formatted contents
Diff io.Reader
// DiffBaseDir is the FS path to the repo's root directory
DiffBaseDir string
// GoCoverage is the FS path to a Go coverage file
GoCoveragePath string
// GoCoverageBaseDir is the FS path to the coverage file's module. Defaults to the coverage file's directory.
GoCoverageBaseDir string
}
// Parse reads and parses both a diff file and Go coverage file, then returns a Covet instance to render reports
func Parse(options Options) (covet *Covet, err error) {
defer func() { err = errors.Wrap(err, "covet") }()
if !hackpadfs.ValidPath(options.DiffBaseDir) {
return nil, errors.Errorf("invalid diff base directory FS path: %s", options.DiffBaseDir)
}
if !hackpadfs.ValidPath(options.GoCoveragePath) {
return nil, errors.Errorf("invalid coverage FS path: %s", options.GoCoveragePath)
}
if options.GoCoverageBaseDir == "" {
options.GoCoverageBaseDir = path.Dir(options.GoCoveragePath)
}
if !hackpadfs.ValidPath(options.GoCoverageBaseDir) {
return nil, errors.Errorf("invalid coverage base directory FS path: %s", options.GoCoverageBaseDir)
}
if options.FS == nil {
options.FS, err = fspath.WorkingDirectoryFS()
if err != nil {
return nil, err
}
}
if options.Diff == nil {
return nil, errors.New("diff reader must not be nil")
}
diffFiles, _, err := gitdiff.Parse(options.Diff)
if err != nil {
return nil, err
}
coverageFile, err := options.FS.Open(options.GoCoveragePath)
if err != nil {
return nil, err
}
defer coverageFile.Close()
coverageFiles, err := cover.ParseProfilesFromReader(coverageFile)
if err != nil {
return nil, err
}
covet = &Covet{
options: options,
addedLines: make(map[string][]span.Span),
coveredLines: make(map[string][]span.Span),
uncoveredLines: make(map[string][]span.Span),
}
_, err = covet.coverageToDiffRel()
if err != nil {
return nil, err
}
covet.addDiff(diffFiles)
if err := covet.addCoverage(options.FS, options.GoCoverageBaseDir, coverageFiles); err != nil {
return nil, err
}
return covet, nil
}
func (c *Covet) addDiff(diffFiles []*gitdiff.File) {
for _, file := range diffFiles {
spans := findDiffAddSpans(file.TextFragments)
c.addedLines[file.NewName] = append(c.addedLines[file.NewName], spans...)
}
}
type signedInteger interface {
~int | ~int64
}
// uintFromBoundedSignedInt converts i to a uint.
// If i is outside 0 to [math.MaxUint32], then it is capped at those bounds.
func uintFromBoundedSignedInt[integer signedInteger](i integer) uint {
if i < 0 {
return 0
}
if i > math.MaxUint32 {
return math.MaxUint32
}
return uint(i)
}
func findDiffAddSpans(fragments []*gitdiff.TextFragment) []span.Span {
var spans []span.Span
for _, fragment := range fragments {
lineNumber := uintFromBoundedSignedInt(fragment.NewPosition)
for _, line := range fragment.Lines {
if line.Op == gitdiff.OpAdd {
if len(spans) == 0 || spans[len(spans)-1].End < lineNumber {
spans = append(spans, span.Span{Start: lineNumber, End: lineNumber + 1})
} else {
spans[len(spans)-1].End++
}
}
if line.New() {
lineNumber++
}
}
}
return spans
}
func (c *Covet) addCoverage(fs hackpadfs.FS, baseDir string, coverageFiles []*cover.Profile) error {
for _, file := range coverageFiles {
for _, block := range file.Blocks {
coverageFile, err := packages.FilePath(fs, baseDir, file.FileName, packages.Options{})
if err != nil {
return err
}
if block.Count > 0 {
c.coveredLines[coverageFile] = append(c.coveredLines[coverageFile], span.Span{
Start: uintFromBoundedSignedInt(block.StartLine),
End: uintFromBoundedSignedInt(block.EndLine + 1),
})
} else {
c.uncoveredLines[coverageFile] = append(c.uncoveredLines[coverageFile], span.Span{
Start: uintFromBoundedSignedInt(block.StartLine),
End: uintFromBoundedSignedInt(block.EndLine + 1),
})
}
}
}
return nil
}
func (c *Covet) coverageToDiffRel() (string, error) {
return fspath.Rel(c.options.DiffBaseDir, c.options.GoCoverageBaseDir)
}
func (c *Covet) coveredAndUncovered() (fileNames map[string]bool, coveredDiff, uncoveredDiff map[string][]span.Span) {
covToDiffRel, _ := c.coverageToDiffRel() // ignore error since it's checked during setup
fileNames = make(map[string]bool)
coveredDiff = make(map[string][]span.Span)
uncoveredDiff = make(map[string][]span.Span)
for file := range c.addedLines {
for _, added := range c.addedLines[file] {
file, err := fspath.Rel(covToDiffRel, file)
if err != nil {
panic(err)
}
for _, covered := range c.coveredLines[file] {
if intersection, ok := added.Intersection(covered); ok {
fileNames[file] = true
coveredDiff[file] = append(coveredDiff[file], intersection)
}
}
for _, uncovered := range c.uncoveredLines[file] {
if intersection, ok := added.Intersection(uncovered); ok {
fileNames[file] = true
uncoveredDiff[file] = append(uncoveredDiff[file], intersection)
}
}
}
}
return
}
// DiffCovered returns the percentage of covered lines in the diff.
func (c *Covet) DiffCovered() float64 {
_, coveredSpans, uncoveredSpans := c.coveredAndUncovered()
var coveredTotal, uncoveredTotal float64
for _, spans := range coveredSpans {
for _, s := range spans {
coveredTotal += float64(s.Len())
}
}
for _, spans := range uncoveredSpans {
for _, s := range spans {
uncoveredTotal += float64(s.Len())
}
}
return coveredTotal / (coveredTotal + uncoveredTotal)
}
// DiffCoverageFiles generates a report of all files that are in the diff and have coverage information.
// These files can be used to display diff coverage information.
func (c *Covet) DiffCoverageFiles() []File {
var coveredFiles []File
fileNames, coveredSpans, uncoveredSpans := c.coveredAndUncovered()
for file := range fileNames {
covered := coveredSpans[file]
uncovered := uncoveredSpans[file]
coveredFile := File{Name: file}
for _, s := range covered {
for i := s.Start; i < s.End; i++ {
coveredFile.Lines = append(coveredFile.Lines, Line{
Covered: true,
LineNumber: i,
})
}
coveredFile.Covered += s.Len()
}
for _, s := range uncovered {
for i := s.Start; i < s.End; i++ {
coveredFile.Lines = append(coveredFile.Lines, Line{
Covered: false,
LineNumber: i,
})
}
coveredFile.Uncovered += s.Len()
}
sort.Slice(coveredFile.Lines, func(a, b int) bool {
return coveredFile.Lines[a].LineNumber < coveredFile.Lines[b].LineNumber
})
coveredFiles = append(coveredFiles, coveredFile)
}
return coveredFiles
}
// ReportFileCoverageOptions contains options to format a file coverage report.
// Reserved for future use.
type ReportFileCoverageOptions struct{}
// ReportFileCoverage writes a diff-like plain text report with color to 'w'.
func (c *Covet) ReportFileCoverage(w io.Writer, f File, _ ReportFileCoverageOptions) error {
name := path.Join(c.options.GoCoverageBaseDir, f.Name)
r, err := c.options.FS.Open(name)
if err != nil {
return err
}
defer r.Close()
chunks, err := DiffChunks(f, r)
if err != nil {
return err
}
for _, chunk := range chunks {
fmt.Fprintln(w, "Coverage:", chunk.FirstLine, "to", chunk.LastLine)
for _, line := range chunk.Lines {
switch {
case strings.HasPrefix(line, "+"):
line = color.GreenString(line)
case strings.HasPrefix(line, "-"):
line = color.RedString(line)
}
fmt.Fprintln(w, line)
}
}
return nil
}