mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2024-12-28 04:19:41 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(segment): only join diamonds with no diamond at end

Browse source
This commit is contained in:
Jan De Dobbeleer 2024-02-29 17:55:28 +01:00 committed by Jan De Dobbeleer
parent a5fc8dbed5
commit bb2ac0cec5
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/engine/block.go
View file

@ -151,7 +151,7 @@ func (b *Block) renderActiveSegment() {
b.writer.Write(ansi.Background, ansi.Foreground, b.activeSegment.text) b.writer.Write(ansi.Background, ansi.Foreground, b.activeSegment.text)
case Diamond: case Diamond:
background := ansi.Transparent background := ansi.Transparent
if b.previousActiveSegment != nil && !b.previousActiveSegment.hasTrailingDiamond() { if b.previousActiveSegment != nil && b.previousActiveSegment.hasEmptyDiamondAtEnd() {
background = b.previousActiveSegment.background() background = b.previousActiveSegment.background()
} }
b.writer.Write(background, ansi.Background, b.activeSegment.LeadingDiamond) b.writer.Write(background, ansi.Background, b.activeSegment.LeadingDiamond)

9
src/engine/segment.go
View file

@ -376,9 +376,12 @@ func (segment *Segment) isPowerline() bool {
return style == Powerline || style == Accordion return style == Powerline || style == Accordion
} }
func (segment *Segment) hasTrailingDiamond() bool { func (segment *Segment) hasEmptyDiamondAtEnd() bool {
style := segment.style() if segment.style() != Diamond {
return style == Diamond && len(segment.TrailingDiamond) > 0 return false
}
return len(segment.TrailingDiamond) == 0
} }
func (segment *Segment) cwdIncluded() bool { func (segment *Segment) cwdIncluded() bool {