Implementation of multiple matching expressions per line. Needs refac…

…tor.

logh.go

@@ -49,21 +49,32 @@ func Highlight(in io.Reader, out io.Writer, matches ...string) {
 		// See if matches with any regexes
 		matched := false
 
-		// lineColors = make([]int, len(line))
-		// for i := range lineColors {
-		// 	lineColors[i] = -1
-		// }
+		// TODO refactor this new implementation
+		lineColors := make([]int, len(line))
+		for i := range lineColors {
+			lineColors[i] = -1
+		}
+
 		for i, rg := range regexes {
 			indexes := rg.FindAllStringIndex(line, -1)
 
 			for _, match := range indexes {
 				start, end := match[0], match[1]
-				fmt.Fprintf(out, "%s%s%s\n", line[:start], colors[i].Sprint(line[start:end]), line[end:])
+				for j := start; j < end; j++ {
+					lineColors[j] = i
+				}
 
 				matched = true
-				break
 			}
 
+			// for _, match := range indexes {
+			// 	start, end := match[0], match[1]
+			// 	fmt.Fprintf(out, "%s%s%s\n", line[:start], colors[i].Sprint(line[start:end]), line[end:])
+
+			// 	matched = true
+			// 	break
+			// }
+
 			// TODO: Add config to highlight the whole line?
 			// if rg.MatchString(line) {
 			// 	// Matches! Highlight and output
@@ -74,6 +85,35 @@ func Highlight(in io.Reader, out io.Writer, matches ...string) {
 			// }
 		}
 
+		if matched {
+			lastColorIdx := -1
+			newLine := ""
+			buff := ""
+			for i, ch := range line {
+				if lineColors[i] != lastColorIdx {
+					if lastColorIdx != -1 {
+						lastColor := colors[lastColorIdx]
+						newLine += lastColor.Sprint(buff)
+					} else {
+						newLine += buff
+					}
+					buff = ""
+
+					lastColorIdx = lineColors[i]
+				}
+				buff += string(ch)
+			}
+			if buff != "" {
+				if lastColorIdx != -1 {
+					lastColor := colors[lastColorIdx]
+					newLine += lastColor.Sprint(buff)
+				} else {
+					newLine += buff
+				}
+			}
+			fmt.Fprintf(out, "%s\n", newLine)
+		}
+
 		// No matches, print with default color
 		if !matched {
 			fmt.Fprintf(out, "%s\n", scanner.Text())

logh_test.go

@@ -114,7 +114,7 @@ func TestLogHighlight(t *testing.T) {
 		want := "col1 col" + color.RedString("2") + " " + color.GreenString("col3") + "\n"
 
 		got := &bytes.Buffer{}
-		logh.Highlight(input, got, "2", "line3")
+		logh.Highlight(input, got, "2", "col3")
 		assertStringEqual(t, got.String(), want)
 	})
 }