Skip to content

Commit 20ab979

Browse files
committed
chore: remove unused branch coverage
1 parent 7b81f8f commit 20ab979

3 files changed

Lines changed: 16 additions & 38 deletions

File tree

internal/coverage/collector.go

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -54,24 +54,17 @@ func (c *Collector) AddSignal(signal runner.CoverageSignal) error {
5454
// addSignalUnsafe adds a signal without locking (internal use when lock is already held)
5555
func (c *Collector) addSignalUnsafe(signal runner.CoverageSignal) error {
5656
// Parse signal ID to extract file, startPos, length, and branch
57-
file, startPos, length, branch, err := instrument.ParseSignalID(signal.SignalID)
57+
file, startPos, length, err := instrument.ParseSignalID(signal.SignalID)
5858
if err != nil {
5959
return fmt.Errorf("invalid signal ID: %w", err)
6060
}
6161

62-
// Add position-based coverage only
63-
if branch == "" {
64-
// Position coverage - increment hit count
65-
posKey := fmt.Sprintf("%d:%d", startPos, length)
66-
if existingCount, exists := c.coverage.Positions[file][posKey]; exists {
67-
c.coverage.AddPosition(file, startPos, length, existingCount+1)
68-
} else {
69-
c.coverage.AddPosition(file, startPos, length, 1)
70-
}
62+
// Position coverage - increment hit count
63+
posKey := fmt.Sprintf("%d:%d", startPos, length)
64+
if existingCount, exists := c.coverage.Positions[file][posKey]; exists {
65+
c.coverage.AddPosition(file, startPos, length, existingCount+1)
7166
} else {
72-
// Branch coverage (placeholder for future)
73-
branchKey := fmt.Sprintf("%d:%d:%s", startPos, length, branch)
74-
c.coverage.AddBranch(file, branchKey, 1)
67+
c.coverage.AddPosition(file, startPos, length, 1)
7568
}
7669

7770
return nil

internal/coverage/model.go

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,6 @@ type Coverage struct {
1616
// PositionHits represents position hit counts for a single file
1717
type PositionHits map[string]int // Key: "startPos:length", Value: hit count
1818

19-
// BranchCoverage represents coverage data for a single branch
20-
type BranchCoverage struct {
21-
BranchID string // e.g., "44:if_true"
22-
HitCount int // Number of times branch taken
23-
Covered bool // true if HitCount > 0
24-
}
25-
2619
// NewCoverage creates a new Coverage instance
2720
func NewCoverage() *Coverage {
2821
return &Coverage{
@@ -44,13 +37,6 @@ func (c *Coverage) AddPosition(file string, startPos int, length int, hitCount i
4437
c.Positions[file][posKey] = hitCount
4538
}
4639

47-
// AddBranch adds or updates branch coverage data (placeholder for future)
48-
func (c *Coverage) AddBranch(_ string, branchID string, hitCount int) {
49-
// TODO: Implement branch coverage tracking
50-
_ = branchID
51-
_ = hitCount
52-
}
53-
5440
// PositionCoveragePercent calculates position coverage percentage for a file
5541
func (c *Coverage) PositionCoveragePercent(file string) float64 {
5642
posHits := c.Positions[file]

internal/instrument/location.go

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func BranchPositionKey(file string, startPos int, length int, branch string) str
4747
}
4848

4949
// ParseSignalID parses a signal ID into file, startPos, length, and optional branch
50-
func ParseSignalID(signalID string) (file string, startPos int, length int, branch string, err error) {
50+
func ParseSignalID(signalID string) (file string, startPos int, length int, err error) {
5151
// Signal format: file:startPos:length or file:startPos:length:branch
5252
// Note: file path may contain colons on Windows (C:\path\to\file.sql)
5353

@@ -64,7 +64,7 @@ func ParseSignalID(signalID string) (file string, startPos int, length int, bran
6464
}
6565

6666
if len(colons) < 2 {
67-
return "", 0, 0, "", fmt.Errorf("invalid signal ID format (expected at least 3 parts): %s", signalID)
67+
return "", 0, 0, fmt.Errorf("invalid signal ID format (expected at least 3 parts): %s", signalID)
6868
}
6969

7070
// Check if there's a branch (four parts)
@@ -80,7 +80,6 @@ func ParseSignalID(signalID string) (file string, startPos int, length int, bran
8080
file = signalID[:thirdLastColon]
8181
startPosStr := signalID[thirdLastColon+1 : secondLastColon]
8282
lengthStr := signalID[secondLastColon+1 : lastColon]
83-
possibleBranch := signalID[lastColon+1:]
8483

8584
// Try to parse startPos and length
8685
var startPosVal, lengthVal int
@@ -90,12 +89,12 @@ func ParseSignalID(signalID string) (file string, startPos int, length int, bran
9089
if parseErr1 == nil && parseErr2 == nil {
9190
// Successfully parsed as file:startPos:length:branch
9291
if startPosVal < 0 {
93-
return "", 0, 0, "", fmt.Errorf("start position must be non-negative, got %d", startPosVal)
92+
return "", 0, 0, fmt.Errorf("start position must be non-negative, got %d", startPosVal)
9493
}
9594
if lengthVal < 0 {
96-
return "", 0, 0, "", fmt.Errorf("length must be non-negative, got %d", lengthVal)
95+
return "", 0, 0, fmt.Errorf("length must be non-negative, got %d", lengthVal)
9796
}
98-
return file, startPosVal, lengthVal, possibleBranch, nil
97+
return file, startPosVal, lengthVal, nil
9998
}
10099
}
101100

@@ -111,22 +110,22 @@ func ParseSignalID(signalID string) (file string, startPos int, length int, bran
111110
var parseErr error
112111
startPos, parseErr = parseNumber(startPosStr)
113112
if parseErr != nil {
114-
return "", 0, 0, "", fmt.Errorf("invalid start position in signal ID %s: %w", signalID, parseErr)
113+
return "", 0, 0, fmt.Errorf("invalid start position in signal ID %s: %w", signalID, parseErr)
115114
}
116115

117116
length, parseErr = parseNumber(lengthStr)
118117
if parseErr != nil {
119-
return "", 0, 0, "", fmt.Errorf("invalid length in signal ID %s: %w", signalID, parseErr)
118+
return "", 0, 0, fmt.Errorf("invalid length in signal ID %s: %w", signalID, parseErr)
120119
}
121120

122121
if startPos < 0 {
123-
return "", 0, 0, "", fmt.Errorf("start position must be non-negative, got %d", startPos)
122+
return "", 0, 0, fmt.Errorf("start position must be non-negative, got %d", startPos)
124123
}
125124
if length < 0 {
126-
return "", 0, 0, "", fmt.Errorf("length must be non-negative, got %d", length)
125+
return "", 0, 0, fmt.Errorf("length must be non-negative, got %d", length)
127126
}
128127

129-
return file, startPos, length, "", nil
128+
return file, startPos, length, nil
130129
}
131130

132131
// parseNumber safely parses a number string

0 commit comments

Comments
 (0)