KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix various off-by-ones in the search code

Browse Source
This commit is contained in:
Kovid Goyal 2023-03-23 08:28:24 +05:30
parent 1926db8ee8
commit 91eaa89b3e
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tools/cmd/diff/search.go
View File

@ -29,8 +29,8 @@ func (self *Search) find_matches_in_lines(clean_lines []string, origin int, send
lengths := utils.Map(func(x string) int { return len(x) }, clean_lines)
offsets := make([]int, len(clean_lines))
for i := range clean_lines {
if i > 1 {
offsets[i] = offsets[i-1] + len(clean_lines[i-1])
if i > 0 {
offsets[i] = offsets[i-1] + lengths[i-1]
}
}
matches := self.pat.FindAllStringIndex(strings.Join(clean_lines, ""), -1)
@ -75,15 +75,22 @@ func (self *Search) find_matches_in_lines(clean_lines []string, origin int, send
func (self *Search) find_matches_in_line(line *LogicalLine, margin_size, cols int, send_result func(screen_line, offset, size int)) {
half_width := cols / 2
right_offset := half_width + 1 + margin_size
right_offset := half_width + margin_size
left_clean_lines, right_clean_lines := make([]string, len(line.screen_lines)), make([]string, len(line.screen_lines))
lt := line.line_type
for i, line := range line.screen_lines {
line = wcswidth.StripEscapeCodes(line)
if len(line) >= half_width+1 {
left_clean_lines[i] = line[margin_size : half_width+1]
}
if len(line) > right_offset {
right_clean_lines[i] = line[right_offset:]
if lt == HUNK_TITLE_LINE {
if len(line) > margin_size {
left_clean_lines[i] = line[margin_size:]
}
} else {
if len(line) >= half_width+1 {
left_clean_lines[i] = line[margin_size:half_width]
}
if len(line) > right_offset {
right_clean_lines[i] = line[right_offset:]
}
}
}
self.find_matches_in_lines(left_clean_lines, margin_size, send_result)

4
tools/cmd/diff/ui.go
View File

@ -9,6 +9,7 @@ import (
"strings"
"kitty/tools/config"
"kitty/tools/tty"
"kitty/tools/tui/graphics"
"kitty/tools/tui/loop"
"kitty/tools/tui/readline"
@ -74,10 +75,9 @@ func (self *Handler) calculate_statistics() {
}
}
var DebugPrintln func(...any)
var DebugPrintln = tty.DebugPrintln
func (self *Handler) initialize() {
DebugPrintln = self.lp.DebugPrintln
self.pending_keys = make([]string, 0, 4)
self.rl = readline.New(self.lp, readline.RlInit{DontMarkPrompts: true, Prompt: "/"})
self.current_context_count = opts.Context