mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-19 15:04:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

More linter fixes

Browse Source
This commit is contained in:
Kovid Goyal
2023-09-23 10:19:46 +05:30
parent 38bac98c12
commit 627c80125b
7 changed files with 55 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
kittens/diff/render.go
View File

@@ -159,7 +159,7 @@ var format_as_sgr struct {
title, margin, added, removed, added_margin, removed_margin, filler, margin_filler, hunk_margin, hunk, selection, search string
}
var statusline_format, added_count_format, removed_count_format, message_format, selection_format func(...any) string
var statusline_format, added_count_format, removed_count_format, message_format func(...any) string
func create_formatters() {
ctx := style.Context{AllowEscapeCodes: true}
@@ -169,7 +169,6 @@ func create_formatters() {
return ans
}
format_as_sgr.filler = only_open("bg=" + conf.Filler_bg.AsRGBSharp())
debugprintln(11111, conf.Margin_filler_bg.IsSet)
if conf.Margin_filler_bg.IsSet {
format_as_sgr.margin_filler = only_open("bg=" + conf.Margin_filler_bg.Color.AsRGBSharp())
} else {
@@ -392,8 +391,6 @@ func image_lines(left_path, right_path string, screen_size screen_size, margin_s
return append(ans, ll), nil
}
type formatter = func(...any) string
func first_binary_line(left_path, right_path string, columns, margin_size int, renderer func(path string) (string, error)) (*LogicalLine, error) {
available_cols := columns/2 - margin_size
ll := LogicalLine{
@@ -771,10 +768,3 @@ func render(collection *Collection, diff_map map[string]*Patch, screen_size scre
}
return &LogicalLines{lines: ll, margin_size: margin_size, columns: columns}, err
}
func (self *LogicalLines) num_of_screen_lines() (ans int) {
for _, l := range self.lines {
ans += len(l.screen_lines)
}
return
}