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

refactor: remove linebreak block type

Browse source
This commit is contained in:
Jan De Dobbeleer 2024-08-26 16:53:56 +02:00 committed by Jan De Dobbeleer
parent b5afe0edaf
commit f1cd609c7d
3 changed files with 1 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/config/block.go
View file

@ -18,8 +18,6 @@ type Overflow string
const (
// Prompt writes one or more Segments
Prompt BlockType = "prompt"
// LineBreak creates a line break in the prompt
LineBreak BlockType = "newline"
// RPrompt is a right aligned prompt
RPrompt BlockType = "rprompt"
// Left aligns left
@ -53,10 +51,6 @@ func (b *Block) Init(env runtime.Environment) {
}
func (b *Block) Enabled() bool {
if b.Type == LineBreak {
return true
}
for _, segment := range b.Segments {
if segment.Enabled {
return true

1
src/config/block_test.go
View file

@ -13,7 +13,6 @@ func TestBlockEnabled(t *testing.T) {
Segments []*Segment
Expected bool
}{
{Case: "line break block", Expected: true, Type: LineBreak},
{Case: "prompt enabled", Expected: true, Type: Prompt, Segments: []*Segment{{Enabled: true}}},
{Case: "prompt disabled", Expected: false, Type: Prompt, Segments: []*Segment{{Enabled: false}}},
{Case: "prompt enabled multiple", Expected: true, Type: Prompt, Segments: []*Segment{{Enabled: false}, {Enabled: true}}},

15
src/prompt/engine.go
View file

@ -168,19 +168,6 @@ func (e *Engine) getTitleTemplateText() string {
func (e *Engine) renderBlock(block *config.Block, cancelNewline bool) bool {
defer e.applyPowerShellBleedPatch()
// This is deprecated but we leave it in to not break configs
// It is encouraged to use "newline": true on block level
// rather than the standalone linebreak block
if block.Type == config.LineBreak {
// do not print a newline to avoid a leading space
// when we're printing the first primary prompt in
// the shell
if !cancelNewline {
e.writeNewline()
}
return false
}
block.Init(e.Env)
if !block.Enabled() {
@ -201,7 +188,7 @@ func (e *Engine) renderBlock(block *config.Block, cancelNewline bool) bool {
return false
}
switch block.Type { //nolint:exhaustive
switch block.Type {
case config.Prompt:
if block.Alignment == config.Left {
e.currentLineLength += length