If the match strings overlap, set the same coloring as git grep

k1LoW · Nov 1, 2021 · 732dc8a · 732dc8a
1 parent 5cd8264
commit 732dc8a
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/scanner/scanner.go b/scanner/scanner.go
@@ -62,14 +62,26 @@ func Scan(ctx context.Context, fsys fs.FS, w io.Writer, opts *Opts) error {
 			}
 
 			sort.Slice(matches, func(i, j int) bool {
-				return matches[i][0] > matches[j][0]
+				return matches[i][0] < matches[j][0]
 			})
 
+			// TODO: refactor
+			i := 0
 			f := [][]int{}
-			for i := range matches {
-				if i+1 == len(matches) || matches[i][1] < matches[i+1][0] {
+			for {
+				if i+1 == len(matches) {
 					f = append(f, matches[i])
+					break
+				} else if i+1 > len(matches) {
+					break
 				}
+				if matches[i][1] < matches[i+1][0] {
+					f = append(f, matches[i])
+				} else if matches[i][1] >= matches[i+1][0] {
+					f = append(f, matches[i])
+					i += 1
+				}
+				i += 1
 			}
 			matches = f