Conditionally highlight wrapped lines

robinovitch61 · Jul 4, 2022 · e84244e · e84244e
1 parent 054be73
commit e84244e
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/internal/tui/components/viewport/viewport.go b/internal/tui/components/viewport/viewport.go
@@ -230,10 +230,13 @@ func (m Model) View() string {
 	visibleLines := m.getVisibleLines()
 	hasNoHighlight := runeCount(m.stringToHighlight) == 0
 	for idx, line := range visibleLines {
-		isSelected := m.selectionEnabled && m.getContentIdx(m.yOffset+idx) == m.selectedContentIdx
+		contentIdx := m.getContentIdx(m.yOffset + idx)
+		isSelected := m.selectionEnabled && contentIdx == m.selectedContentIdx
+
 		lineStyle := m.ContentStyle
 		for k, v := range m.ConditionalStyle {
-			if strings.Contains(line, k) {
+			entireLine := m.content[contentIdx]
+			if strings.Contains(entireLine, k) {
 				lineStyle = v
 			}
 		}