mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2024-12-31 13:57:26 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: do not print empty powerline symbol

Browse source 
relates to #1433
This commit is contained in:
Jan De Dobbeleer 2021-12-17 10:37:18 +01:00 committed by Jan De Dobbeleer
parent 27df69f119
commit 2fddfa1716
1 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/block.go
View file

@ -63,6 +63,7 @@ func (b *Block) setActiveSegment(segment *Segment) {
b.activeSegment = segment b.activeSegment = segment
b.activeBackground = segment.background() b.activeBackground = segment.background()
b.activeForeground = segment.foreground() b.activeForeground = segment.foreground()
b.writer.setColors(b.activeBackground, b.activeForeground)
} }
func (b *Block) enabled() bool { func (b *Block) enabled() bool {
@ -102,13 +103,35 @@ func (b *Block) renderSegments() string {
return b.writer.string() return b.writer.string()
} }
func (b *Block) writePowerline(end bool) { func (b *Block) renderSegment(segment *Segment) {
b.setActiveSegment(segment)
b.writePowerline(false)
switch b.activeSegment.Style {
case Plain, Powerline:
b.renderText(segment.stringValue)
case Diamond:
b.writer.write(Transparent, b.activeBackground, b.activeSegment.LeadingDiamond)
b.renderText(segment.stringValue)
b.writer.write(Transparent, b.activeBackground, b.activeSegment.TrailingDiamond)
}
b.previousActiveSegment = b.activeSegment
b.writer.setParentColors(b.activeBackground, b.activeForeground)
}
func (b *Block) renderText(text string) {
defaultValue := " "
b.writer.write(b.activeBackground, b.activeForeground, b.activeSegment.getValue(Prefix, defaultValue))
b.writer.write(b.activeBackground, b.activeForeground, text)
b.writer.write(b.activeBackground, b.activeForeground, b.activeSegment.getValue(Postfix, defaultValue))
}
func (b *Block) writePowerline(final bool) {
resolvePowerlineSymbol := func() string { resolvePowerlineSymbol := func() string {
var symbol string var symbol string
if b.previousActiveSegment != nil && b.previousActiveSegment.Style == Powerline { if b.activeSegment.Style == Powerline {
symbol = b.previousActiveSegment.PowerlineSymbol
} else if b.activeSegment.Style == Powerline {
symbol = b.activeSegment.PowerlineSymbol symbol = b.activeSegment.PowerlineSymbol
} else if b.previousActiveSegment != nil && b.previousActiveSegment.Style == Powerline {
symbol = b.previousActiveSegment.PowerlineSymbol
} }
return symbol return symbol
} }
@ -117,7 +140,7 @@ func (b *Block) writePowerline(end bool) {
return return
} }
background := b.activeSegment.background() background := b.activeSegment.background()
if end || b.activeSegment.Style != Powerline { if final || b.activeSegment.Style != Powerline {
background = Transparent background = Transparent
} }
if b.activeSegment.Style == Diamond && len(b.activeSegment.LeadingDiamond) == 0 { if b.activeSegment.Style == Diamond && len(b.activeSegment.LeadingDiamond) == 0 {
@ -146,29 +169,6 @@ func (b *Block) getPowerlineColor() string {
return b.previousActiveSegment.background() return b.previousActiveSegment.background()
} }
func (b *Block) renderSegment(segment *Segment) {
b.setActiveSegment(segment)
b.writePowerline(false)
b.writer.setColors(b.activeBackground, b.activeForeground)
switch b.activeSegment.Style {
case Plain, Powerline:
b.renderText(segment.stringValue)
case Diamond:
b.writer.write(Transparent, b.activeBackground, b.activeSegment.LeadingDiamond)
b.renderText(segment.stringValue)
b.writer.write(Transparent, b.activeBackground, b.activeSegment.TrailingDiamond)
}
b.previousActiveSegment = b.activeSegment
b.writer.setParentColors(b.activeBackground, b.activeForeground)
}
func (b *Block) renderText(text string) {
defaultValue := " "
b.writer.write(b.activeBackground, b.activeForeground, b.activeSegment.getValue(Prefix, defaultValue))
b.writer.write(b.activeBackground, b.activeForeground, text)
b.writer.write(b.activeBackground, b.activeForeground, b.activeSegment.getValue(Postfix, defaultValue))
}
func (b *Block) debug() (int, []*SegmentTiming) { func (b *Block) debug() (int, []*SegmentTiming) {
var segmentTimings []*SegmentTiming var segmentTimings []*SegmentTiming
largestSegmentNameLength := 0 largestSegmentNameLength := 0