mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2024-12-26 19:39:39 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(elvish): prevent cutting off a right-aligned block
Some checks failed
Code QL / code-ql (push) Has been cancelled
Details
Azure Static Web Apps CI/CD / Build and Deploy (push) Has been cancelled
Details
Release / changelog (push) Has been cancelled
Details
Release / artifacts (push) Has been cancelled
Details

Browse source
This commit is contained in:
L. Yeung 2024-09-02 11:04:22 +08:00 committed by Jan De Dobbeleer
parent b492903f08
commit f54cd26436
1 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/prompt/engine.go
View file

@ -108,8 +108,9 @@ func (e *Engine) pwd() {
}
func (e *Engine) getNewline() string {
// WARP terminal will remove \n from the prompt, so we hack a newline in
if e.isWarp() {
// WARP terminal will remove \n from the prompt, so we hack a newline in.
// For Elvish, we do this to prevent cutting off a right-aligned block.
if e.isWarp() || e.Env.Shell() == shell.ELVISH {
return terminal.LineBreak()
}
@ -528,24 +529,25 @@ func New(flags *runtime.Flags) *Engine {
Plain: flags.Plain,
}
if cfg.PatchPwshBleed {
eng.patchPowerShellBleed()
switch env.Shell() {
case shell.ELVISH:
// In Elvish, continuous text is always cut off before the right-most cell on the terminal screen.
// We have to reduce the terminal width by 1 so a right-aligned block will not be broken.
eng.rectifyTerminalWidth(-1)
case shell.PWSH, shell.PWSH5:
// when in PowerShell, and force patching the bleed bug
// we need to reduce the terminal width by 1 so the last
// character isn't cut off by the ANSI escape sequences
// See https://github.com/JanDeDobbeleer/oh-my-posh/issues/65
if cfg.PatchPwshBleed {
eng.rectifyTerminalWidth(-1)
}
}
return eng
}
func (e *Engine) patchPowerShellBleed() {
sh := e.Env.Shell()
// when in PowerShell, and force patching the bleed bug
// we need to reduce the terminal width by 1 so the last
// character isn't cut off by the ANSI escape sequences
// See https://github.com/JanDeDobbeleer/oh-my-posh/issues/65
if sh != shell.PWSH && sh != shell.PWSH5 {
return
}
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 {
@ -553,5 +555,5 @@ func (e *Engine) patchPowerShellBleed() {
return
}
e.Env.Flags().TerminalWidth--
e.Env.Flags().TerminalWidth += diff
}