From 7b16132b75505687411ce1011b28391ad2712811 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 23 Mar 2023 16:17:30 +0530
Subject: [PATCH] Fix searching in full title lines

---
 tools/cmd/diff/render.go | 4 +++-
 tools/cmd/diff/search.go | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/cmd/diff/render.go b/tools/cmd/diff/render.go
index 9fdd7ae2c..31ff8f7a9 100644
--- a/tools/cmd/diff/render.go
+++ b/tools/cmd/diff/render.go
@@ -18,6 +18,7 @@ type LineType int
 
 const (
 	TITLE_LINE LineType = iota
+	FULL_TITLE_LINE
 	CHANGE_LINE
 	HUNK_TITLE_LINE
 	IMAGE_LINE
@@ -112,6 +113,7 @@ func title_lines(left_path, right_path string, columns, margin_size int, ans []*
 	left_name, right_name := path_name_map[left_path], path_name_map[right_path]
 	name := ""
 	m := strings.Repeat(` `, margin_size)
+	ll := LogicalLine{line_type: TITLE_LINE, src: Reference{path: left_path, linenum: 0}}
 	if right_name != "" && right_name != left_name {
 		n1 := fit_in(m+sanitize(left_name), columns/2-margin_size)
 		n1 = place_in(n1, columns/2)
@@ -120,8 +122,8 @@ func title_lines(left_path, right_path string, columns, margin_size int, ans []*
 		name = n1 + n2
 	} else {
 		name = place_in(m+sanitize(left_name), columns)
+		ll.line_type = FULL_TITLE_LINE
 	}
-	ll := LogicalLine{line_type: TITLE_LINE, src: Reference{path: left_path, linenum: 0}}
 	l1 := ll
 	l1.screen_lines = []string{title_format(name)}
 	l2 := ll
diff --git a/tools/cmd/diff/search.go b/tools/cmd/diff/search.go
index 3854d2924..c2a8a868f 100644
--- a/tools/cmd/diff/search.go
+++ b/tools/cmd/diff/search.go
@@ -80,7 +80,7 @@ func (self *Search) find_matches_in_line(line *LogicalLine, margin_size, cols in
 	lt := line.line_type
 	for i, line := range line.screen_lines {
 		line = wcswidth.StripEscapeCodes(line)
-		if lt == HUNK_TITLE_LINE {
+		if lt == HUNK_TITLE_LINE || lt == FULL_TITLE_LINE {
 			if len(line) > margin_size {
 				left_clean_lines[i] = line[margin_size:]
 			}