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): write real newlines for Elvish on non-Windows systems
Some checks failed
Code QL / code-ql (push) Waiting to run
Details
Release / changelog (push) Waiting to run
Details
Release / artifacts (push) Blocked by required conditions
Details
Azure Static Web Apps CI/CD / Build and Deploy (push) Has been cancelled
Details

Browse source
This commit is contained in:
L. Yeung 2024-09-19 14:58:59 +08:00 committed by Jan De Dobbeleer
parent 68a1e89f29
commit 3114666a25
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/prompt/engine.go
View file

@ -113,8 +113,8 @@ func (e *Engine) getNewline() string {
} }
// Warp terminal will remove a newline character ('\n') from the prompt, so we hack it in. // Warp terminal will remove a newline character ('\n') from the prompt, so we hack it in.
// For Elvish, we do this to prevent cutting off a right-aligned block. // For Elvish on Windows, we do this to prevent cutting off a right-aligned block.
if e.isWarp() || e.Env.Shell() == shell.ELVISH { if e.isWarp() || (e.Env.Shell() == shell.ELVISH && e.Env.GOOS() == runtime.WINDOWS) {
return terminal.LineBreak() return terminal.LineBreak()
} }
@ -545,16 +545,17 @@ func New(flags *runtime.Flags) *Engine {
} }
switch env.Shell() { switch env.Shell() {
case shell.TCSH: case shell.XONSH:
// In Tcsh, newlines in a prompt are badly translated. // In Xonsh, the behavior of wrapping at the end of a prompt line is inconsistent across platforms.
// 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)
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. // 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 { if eng.Env.GOOS() == runtime.WINDOWS {
eng.rectifyTerminalWidth(-1) eng.rectifyTerminalWidth(-1)
} }
case shell.TCSH, shell.ELVISH:
// In Tcsh, newlines in a prompt are badly translated.
// No silver bullet here. We have to reduce the terminal width by 1 so a right-aligned block will not be broken.
// In Elvish, the behavior is similar to that in Xonsh, but we do this for all platforms.
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

7
src/prompt/rprompt.go
View file

@ -2,6 +2,8 @@ package prompt
import ( import (
"github.com/jandedobbeleer/oh-my-posh/src/config" "github.com/jandedobbeleer/oh-my-posh/src/config"
"github.com/jandedobbeleer/oh-my-posh/src/runtime"
"github.com/jandedobbeleer/oh-my-posh/src/shell"
) )
func (e *Engine) RPrompt() string { func (e *Engine) RPrompt() string {
@ -29,5 +31,10 @@ func (e *Engine) RPrompt() string {
text, length := e.renderBlockSegments(rprompt) text, length := e.renderBlockSegments(rprompt)
e.rpromptLength = length e.rpromptLength = length
if e.Env.Shell() == shell.ELVISH && e.Env.GOOS() != runtime.WINDOWS {
// Workaround to align with a right-aligned block on non-Windows systems.
text += " "
}
return text return text
} }