Skip to content

Commit c9da33a

Browse files
committed
preserve Format.Render compatibility
Signed-off-by: Alex Suraci <suraci.alex@gmail.com>
1 parent 2183cda commit c9da33a

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

canvas.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ func (canvas *Canvas) ResizeX(w int) {
344344
}
345345

346346
func (region *Region) String() string {
347-
return fmt.Sprintf("%s:%d", region.F.Render(nil, nil), region.Size)
347+
return fmt.Sprintf("%s:%d", region.F.Render(), region.Size)
348348
}
349349

350350
func (region *Region) consumeNext() {

render.go

+7-3
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func (line Line) Display() string {
5050
f := line.Format[col]
5151
if f != lastFormat {
5252
lastFormat = f
53-
out += f.Render(nil, nil)
53+
out += f.Render()
5454
}
5555
out += string(r)
5656
}
@@ -74,7 +74,7 @@ func (vt *Terminal) renderLine(w io.Writer, row int, fg, bg termenv.Color) error
7474
// if lastFormat != EmptyFormat {
7575
// fmt.Fprint(w, resetSeq)
7676
// }
77-
fmt.Fprint(w, f.Render(fg, bg))
77+
fmt.Fprint(w, f.RenderFgBg(fg, bg))
7878
lastFormat = f
7979
}
8080
}
@@ -135,7 +135,11 @@ func brighten(color termenv.Color) termenv.Color {
135135
}
136136
}
137137

138-
func (f Format) Render(fg, bg termenv.Color) string {
138+
func (f Format) Render() string {
139+
return f.RenderFgBg(nil, nil)
140+
}
141+
142+
func (f Format) RenderFgBg(fg, bg termenv.Color) string {
139143
styles := []string{}
140144

141145
if f.IsBold() {

0 commit comments

Comments
 (0)