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

Fix margin formatting for binary lines

Browse Source
This commit is contained in:
Kovid Goyal 2023-03-27 08:23:10 +05:30
parent d66da811db
commit 9cc54978e6
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tools/cmd/diff/render.go
View File

@ -260,7 +260,7 @@ func render_diff_line(number, text, ltype string, margin_size int, available_col
func image_lines(left_path, right_path string, screen_size screen_size, margin_size int, image_size graphics.Size, ans []*LogicalLine) ([]*LogicalLine, error) { func image_lines(left_path, right_path string, screen_size screen_size, margin_size int, image_size graphics.Size, ans []*LogicalLine) ([]*LogicalLine, error) {
columns := screen_size.columns columns := screen_size.columns
available_cols := columns/2 - margin_size available_cols := columns/2 - margin_size
ll, err := first_binary_line(left_path, right_path, columns, margin_size, func(path string, formatter func(...any) string) (string, error) { ll, err := first_binary_line(left_path, right_path, columns, margin_size, func(path string, formatter, margin_formatter formatter) (string, error) {
sz, err := size_for_path(path) sz, err := size_for_path(path)
if err != nil { if err != nil {
return "", err return "", err
@ -271,7 +271,7 @@ func image_lines(left_path, right_path string, screen_size screen_size, margin_s
text = fmt.Sprintf("Dimensions: %dx%d %s", res.Width, res.Height, text) text = fmt.Sprintf("Dimensions: %dx%d %s", res.Width, res.Height, text)
} }
text = place_in(text, available_cols) text = place_in(text, available_cols)
return formatter(strings.Repeat(` `, margin_size) + text), err return margin_formatter(strings.Repeat(` `, margin_size)) + formatter(text), err
}) })
if err != nil { if err != nil {
@ -318,29 +318,31 @@ func image_lines(left_path, right_path string, screen_size screen_size, margin_s
return append(ans, ll), nil return append(ans, ll), nil
} }
func first_binary_line(left_path, right_path string, columns, margin_size int, renderer func(path string, formatter func(...any) string) (string, error)) (*LogicalLine, error) { type formatter = func(...any) string
func first_binary_line(left_path, right_path string, columns, margin_size int, renderer func(path string, formatter, margin_formatter formatter) (string, error)) (*LogicalLine, error) {
available_cols := columns/2 - margin_size available_cols := columns/2 - margin_size
line := "" line := ""
if left_path == "" { if left_path == "" {
filler := render_diff_line(``, ``, `filler`, margin_size, available_cols) filler := render_diff_line(``, ``, `filler`, margin_size, available_cols)
r, err := renderer(right_path, added_format) r, err := renderer(right_path, added_format, added_margin_format)
if err != nil { if err != nil {
return nil, err return nil, err
} }
line = filler + r line = filler + r
} else if right_path == "" { } else if right_path == "" {
filler := render_diff_line(``, ``, `filler`, margin_size, available_cols) filler := render_diff_line(``, ``, `filler`, margin_size, available_cols)
l, err := renderer(left_path, removed_format) l, err := renderer(left_path, removed_format, removed_margin_format)
if err != nil { if err != nil {
return nil, err return nil, err
} }
line = l + filler line = l + filler
} else { } else {
l, err := renderer(left_path, removed_format) l, err := renderer(left_path, removed_format, removed_margin_format)
if err != nil { if err != nil {
return nil, err return nil, err
} }
r, err := renderer(right_path, added_format) r, err := renderer(right_path, added_format, added_margin_format)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -359,14 +361,14 @@ func first_binary_line(left_path, right_path string, columns, margin_size int, r
func binary_lines(left_path, right_path string, columns, margin_size int, ans []*LogicalLine) (ans2 []*LogicalLine, err error) { func binary_lines(left_path, right_path string, columns, margin_size int, ans []*LogicalLine) (ans2 []*LogicalLine, err error) {
available_cols := columns/2 - margin_size available_cols := columns/2 - margin_size
ll, err := first_binary_line(left_path, right_path, columns, margin_size, func(path string, formatter func(...any) string) (string, error) { ll, err := first_binary_line(left_path, right_path, columns, margin_size, func(path string, formatter, margin_formatter formatter) (string, error) {
sz, err := size_for_path(path) sz, err := size_for_path(path)
if err != nil { if err != nil {
return "", err return "", err
} }
text := fmt.Sprintf("Binary file: %s", human_readable(sz)) text := fmt.Sprintf("Binary file: %s", human_readable(sz))
text = place_in(text, available_cols) text = place_in(text, available_cols)
return formatter(strings.Repeat(` `, margin_size) + text), err return margin_formatter(strings.Repeat(` `, margin_size)) + formatter(text), err
}) })
if err != nil { if err != nil {