mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2024-11-10 04:54:03 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(engine): do not print empty block

Browse source
This commit is contained in:
Jan De Dobbeleer 2023-08-30 12:46:36 +02:00 committed by Jan De Dobbeleer
parent eaa28738e2
commit 7cf63eead5
1 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/engine/engine.go
View file

@ -161,6 +161,19 @@ func (e *Engine) getTitleTemplateText() string {
func (e *Engine) renderBlock(block *Block, cancelNewline bool) {
defer e.patchPowerShellBleed()
// This is deprecated but we leave it in to not break configs
// It is encouraged to used "newline": true on block level
// rather than the standalone the linebreak block
if block.Type == LineBreak {
// do not print a newline to avoid a leading space
// when we're printin the first primary prompt in
// the shell
if !cancelNewline {
e.newline()
}
return
}
// when in bash, for rprompt blocks we need to write plain
// and wrap in escaped mode or the prompt will not render correctly
if e.Env.Shell() == shell.BASH && block.Type == RPrompt {
@ -180,25 +193,20 @@ func (e *Engine) renderBlock(block *Block, cancelNewline bool) {
e.newline()
}
switch block.Type {
// This is deprecated but we leave it in to not break configs
// It is encouraged to used "newline": true on block level
// rather than the standalone the linebreak block
case LineBreak:
// do not print a newline to avoid a leading space
// when we're printin the first primary prompt in
// the shell
if !cancelNewline {
text, length := block.RenderSegments()
// do not print anything when we don't have any text
if length == 0 {
return
}
e.newline()
switch block.Type { //nolint:exhaustive
case Prompt:
if block.VerticalOffset != 0 {
e.write(e.Writer.ChangeLine(block.VerticalOffset))
}
if block.Alignment == Left {
text, length := block.RenderSegments()
e.currentLineLength += length
e.write(text)
return
@ -208,8 +216,6 @@ func (e *Engine) renderBlock(block *Block, cancelNewline bool) {
return
}
text, length := block.RenderSegments()
space, OK := e.canWriteRightBlock(false)
// we can't print the right block as there's not enough room available
if !OK {
@ -247,7 +253,8 @@ func (e *Engine) renderBlock(block *Block, cancelNewline bool) {
prompt += text
e.write(prompt)
case RPrompt:
e.rprompt, e.rpromptLength = block.RenderSegments()
e.rprompt = text
e.rpromptLength = length
}
}