mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2025-01-13 04:07:25 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix(block): print leading diamond when set at block level

Browse source
This commit is contained in:
Jan De Dobbeleer 2024-11-20 06:57:35 +01:00 committed by Jan De Dobbeleer
parent cd0eacf4df
commit bb93e11d5f
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/prompt/segments.go
View file

@ -31,6 +31,10 @@ func (e *Engine) writeBlockSegments(block *config.Block) (string, int) {
e.writeSegments(out, block)
if e.activeSegment != nil && len(block.TrailingDiamond) > 0 {
e.activeSegment.TrailingDiamond = block.TrailingDiamond
}
e.writeSeparator(true)
e.activeSegment = nil
@ -72,7 +76,7 @@ func (e *Engine) writeSegments(out chan result, block *config.Block) {
}
segment.Render()
e.writeSegment(current, block, segment)
e.writeSegment(block, segment)
if current == count-1 {
return
@ -87,9 +91,9 @@ func (e *Engine) writeSegments(out chan result, block *config.Block) {
}
}
func (e *Engine) writeSegment(index int, block *config.Block, segment *config.Segment) {
func (e *Engine) writeSegment(block *config.Block, segment *config.Segment) bool {
if !segment.Enabled && segment.ResolveStyle() != config.Accordion {
return
return false
}
if colors, newCycle := cycle.Loop(); colors != nil {
@ -98,16 +102,14 @@ func (e *Engine) writeSegment(index int, block *config.Block, segment *config.Se
segment.Background = colors.Background
}
if index == 0 && len(block.LeadingDiamond) > 0 {
if terminal.Len() == 0 && len(block.LeadingDiamond) > 0 {
segment.LeadingDiamond = block.LeadingDiamond
}
if index == len(block.Segments)-1 && len(block.TrailingDiamond) > 0 {
segment.TrailingDiamond = block.TrailingDiamond
}
e.setActiveSegment(segment)
e.renderActiveSegment()
return true
}
func (e *Engine) canRenderSegment(segment *config.Segment, executed []string) bool {

4
src/terminal/writer.go
View file

@ -358,6 +358,10 @@ func Write(background, foreground color.Ansi, text string) {
currentColor.Pop()
}
func Len() int {
return length
}
func String() (string, int) {
defer func() {
length = 0