mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2025-02-02 05:41:10 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: escape ANSI correctly in bash

Browse source
This commit is contained in:
Jan De Dobbeleer 2020-10-12 19:32:37 +02:00 committed by Jan De Dobbeleer
parent 9627b905e6
commit f281939f93
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
renderer.go
View file

@ -36,6 +36,7 @@ const (
//Transparent implies a transparent color //Transparent implies a transparent color
Transparent string = "transparent" Transparent string = "transparent"
zsh Shell = "zsh" zsh Shell = "zsh"
bash Shell = "bash"
universal Shell = "any" universal Shell = "any"
) )
@ -54,6 +55,16 @@ func (r *Renderer) init(shell string) {
r.formats.right = "%%{\x1b[%dD%%}" r.formats.right = "%%{\x1b[%dD%%}"
r.formats.title = "%%{\033]0;%s\007%%}" r.formats.title = "%%{\033]0;%s\007%%}"
r.shell = zsh r.shell = zsh
case "bash":
r.formats.single = "\\[\x1b[%sm\\]%s\\[\x1b[0m\\]"
r.formats.full = "\\[\x1b[%sm\x1b[%sm\\]%s\\[\x1b[0m\\]"
r.formats.transparent = "\\[\x1b[%s;49m\x1b[7m\\]%s\\[\x1b[m\x1b[0m\\]"
r.formats.linebreak = "\n"
r.formats.linechange = "\\[\x1b[%d%s\\]"
r.formats.left = "\\[\x1b[%dC\\]"
r.formats.right = "\\[\x1b[%dD\\]"
r.formats.title = "\\[\033]0;%s\007\\]"
r.shell = bash
default: default:
r.formats.single = "\x1b[%sm%s\x1b[0m" r.formats.single = "\x1b[%sm%s\x1b[0m"
r.formats.full = "\x1b[%sm\x1b[%sm%s\x1b[0m" r.formats.full = "\x1b[%sm\x1b[%sm%s\x1b[0m"
@ -109,9 +120,13 @@ func (r *Renderer) write(background string, foreground string, text string) {
func (r *Renderer) lenWithoutANSI(str string) int { func (r *Renderer) lenWithoutANSI(str string) int {
re := regexp.MustCompile(r.formats.rANSI) re := regexp.MustCompile(r.formats.rANSI)
stripped := re.ReplaceAllString(str, "") stripped := re.ReplaceAllString(str, "")
if r.shell == zsh { switch r.shell {
case zsh:
stripped = strings.Replace(stripped, "%{", "", -1) stripped = strings.Replace(stripped, "%{", "", -1)
stripped = strings.Replace(stripped, "%}", "", -1) stripped = strings.Replace(stripped, "%}", "", -1)
case bash:
stripped = strings.Replace(stripped, "\\[", "", -1)
stripped = strings.Replace(stripped, "\\]", "", -1)
} }
var i norm.Iter var i norm.Iter
i.InitString(norm.NFD, stripped) i.InitString(norm.NFD, stripped)