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

fix(prompt): rectify terminal width for proper rendering

Browse source
This commit is contained in:
L. Yeung 2024-09-17 03:16:42 +08:00 committed by Jan De Dobbeleer
parent c7793a5f29
commit d2e04b6654
1 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/prompt/engine.go
View file

@ -508,6 +508,17 @@ func (e *Engine) adjustTrailingDiamondColorOverrides() {
} }
} }
func (e *Engine) rectifyTerminalWidth(diff int) {
// Since the terminal width may not be given by the CLI flag, we should always call this here.
_, err := e.Env.TerminalWidth()
if err != nil {
// Skip when we're unable to determine the terminal width.
return
}
e.Env.Flags().TerminalWidth += diff
}
// New returns a prompt engine initialized with the // New returns a prompt engine initialized with the
// given configuration options, and is ready to print any // given configuration options, and is ready to print any
// of the prompt components. // of the prompt components.
@ -534,10 +545,16 @@ func New(flags *runtime.Flags) *Engine {
} }
switch env.Shell() { switch env.Shell() {
case shell.ELVISH: case shell.TCSH:
// In Elvish, a prompt line will always wrap when the cursor reaches the rightmost cell on the terminal screen. // In Tcsh, newlines in a prompt are badly translated.
// We have to reduce the terminal width by 1 so a right-aligned block will not be broken. // No silver bullet here. We have to reduce the terminal width by 1 so a right-aligned block will not be broken.
eng.rectifyTerminalWidth(-1) eng.rectifyTerminalWidth(-1)
case shell.ELVISH, shell.XONSH:
// In these shells, the behavior of wrapping at the end of a prompt line is inconsistent across platforms.
// On Windows, it wraps before the rightmost cell on the terminal screen, that is, the rightmost cell is never available for a prompt line.
if eng.Env.GOOS() == runtime.WINDOWS {
eng.rectifyTerminalWidth(-1)
}
case shell.PWSH, shell.PWSH5: case shell.PWSH, shell.PWSH5:
// when in PowerShell, and force patching the bleed bug // when in PowerShell, and force patching the bleed bug
// we need to reduce the terminal width by 1 so the last // we need to reduce the terminal width by 1 so the last
@ -550,14 +567,3 @@ func New(flags *runtime.Flags) *Engine {
return eng return eng
} }
func (e *Engine) rectifyTerminalWidth(diff int) {
// Since the terminal width may not be given by the CLI flag, we should always call this here.
_, err := e.Env.TerminalWidth()
if err != nil {
// Skip when we're unable to determine the terminal width.
return
}
e.Env.Flags().TerminalWidth += diff
}