mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2025-03-05 20:49:04 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(image): render background colors correctly

Browse source
This commit is contained in:
L. Yeung 2022-05-10 09:47:27 +08:00 committed by Jan De Dobbeleer
parent ef5bb488c8
commit 2d90ce7cbe
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/engine/image.go
View file

@ -47,12 +47,14 @@ const (
fg = "FG" fg = "FG"
bg = "BG" bg = "BG"
bc = "BC" // for base 16 colors
str = "STR" str = "STR"
url = "URL" url = "URL"
invertedColor = "inverted" invertedColor = "inverted"
invertedColorSingle = "invertedsingle" invertedColorSingle = "invertedsingle"
fullColor = "full" fullColor = "full"
foreground = "foreground" foreground = "foreground"
background = "background"
reset = "reset" reset = "reset"
bold = "bold" bold = "bold"
boldReset = "boldr" boldReset = "boldr"
@ -176,6 +178,7 @@ func (ir *ImageRenderer) Init(config string) {
invertedColorSingle: `^(?P<STR>\x1b\[(?P<BG>\d{2,3});49m\x1b\[7m)`, invertedColorSingle: `^(?P<STR>\x1b\[(?P<BG>\d{2,3});49m\x1b\[7m)`,
fullColor: `^(?P<STR>(\x1b\[48;2;(?P<BG>(\d+;?){3})m)(\x1b\[38;2;(?P<FG>(\d+;?){3})m))`, fullColor: `^(?P<STR>(\x1b\[48;2;(?P<BG>(\d+;?){3})m)(\x1b\[38;2;(?P<FG>(\d+;?){3})m))`,
foreground: `^(?P<STR>(\x1b\[38;2;(?P<FG>(\d+;?){3})m))`, foreground: `^(?P<STR>(\x1b\[38;2;(?P<FG>(\d+;?){3})m))`,
background: `^(?P<STR>(\x1b\[48;2;(?P<BG>(\d+;?){3})m))`,
reset: `^(?P<STR>\x1b\[0m)`, reset: `^(?P<STR>\x1b\[0m)`,
bold: `^(?P<STR>\x1b\[1m)`, bold: `^(?P<STR>\x1b\[1m)`,
boldReset: `^(?P<STR>\x1b\[22m)`, boldReset: `^(?P<STR>\x1b\[22m)`,
@ -185,7 +188,7 @@ func (ir *ImageRenderer) Init(config string) {
underlineReset: `^(?P<STR>\x1b\[24m)`, underlineReset: `^(?P<STR>\x1b\[24m)`,
strikethrough: `^(?P<STR>\x1b\[9m)`, strikethrough: `^(?P<STR>\x1b\[9m)`,
strikethroughReset: `^(?P<STR>\x1b\[29m)`, strikethroughReset: `^(?P<STR>\x1b\[29m)`,
color16: `^(?P<STR>\x1b\[(?P<FG>\d{2,3})m)`, color16: `^(?P<STR>\x1b\[(?P<BC>\d{2,3})m)`,
left: `^(?P<STR>\x1b\[(\d{1,3})D)`, left: `^(?P<STR>\x1b\[(\d{1,3})D)`,
osc99: `^(?P<STR>\x1b\]9;9;(.+)\x1b\\)`, osc99: `^(?P<STR>\x1b\]9;9;(.+)\x1b\\)`,
lineChange: `^(?P<STR>\x1b\[(\d)[FB])`, lineChange: `^(?P<STR>\x1b\[(\d)[FB])`,
@ -476,6 +479,9 @@ func (ir *ImageRenderer) shouldPrint() bool {
case foreground: case foreground:
ir.foregroundColor = NewRGBColor(match[fg]) ir.foregroundColor = NewRGBColor(match[fg])
return false return false
case background:
ir.backgroundColor = NewRGBColor(match[bg])
return false
case reset: case reset:
ir.foregroundColor = ir.defaultForegroundColor ir.foregroundColor = ir.defaultForegroundColor
ir.backgroundColor = nil ir.backgroundColor = nil
@ -489,7 +495,7 @@ func (ir *ImageRenderer) shouldPrint() bool {
case strikethrough, strikethroughReset, left, osc99, lineChange, consoleTitle: case strikethrough, strikethroughReset, left, osc99, lineChange, consoleTitle:
return false return false
case color16: case color16:
ir.setBase16Color(match[fg]) ir.setBase16Color(match[bc])
return false return false
case link: case link:
ir.AnsiString = match[url] + ir.AnsiString ir.AnsiString = match[url] + ir.AnsiString