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

fix: avoid variable expansion when using postfix in zsh

Browse source 
% must be escaped otherwise zsh try to apply variable expansion

Co-authored-by: Jan De Dobbeleer <2492783+JanDeDobbeleer@users.noreply.github.com>
This commit is contained in:
Laurent Nullens 2021-08-15 09:45:44 +02:00 committed by GitHub
parent 572149b176
commit 3f02ad4eb3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/ansi.go
View file

@ -32,6 +32,12 @@ type ansiUtils struct {
underline string underline string
strikethrough string strikethrough string
bashFormat string bashFormat string
shellReservedKeywords []shellKeyWordReplacement
}
type shellKeyWordReplacement struct {
text string
replacement string
} }
func (a *ansiUtils) init(shell string) { func (a *ansiUtils) init(shell string) {
@ -59,6 +65,8 @@ func (a *ansiUtils) init(shell string) {
a.italic = "%%{\x1b[3m%%}%s%%{\x1b[23m%%}" a.italic = "%%{\x1b[3m%%}%s%%{\x1b[23m%%}"
a.underline = "%%{\x1b[4m%%}%s%%{\x1b[24m%%}" a.underline = "%%{\x1b[4m%%}%s%%{\x1b[24m%%}"
a.strikethrough = "%%{\x1b[9m%%}%s%%{\x1b[29m%%}" a.strikethrough = "%%{\x1b[9m%%}%s%%{\x1b[29m%%}"
// escape double quotes and variable expansion
a.shellReservedKeywords = append(a.shellReservedKeywords, shellKeyWordReplacement{"\\", "\\\\"}, shellKeyWordReplacement{"%", "%%"})
case bash: case bash:
a.linechange = "\\[\x1b[%d%s\\]" a.linechange = "\\[\x1b[%d%s\\]"
a.right = "\\[\x1b[%dC\\]" a.right = "\\[\x1b[%dC\\]"
@ -80,6 +88,9 @@ func (a *ansiUtils) init(shell string) {
a.italic = "\\[\x1b[3m\\]%s\\[\x1b[23m\\]" a.italic = "\\[\x1b[3m\\]%s\\[\x1b[23m\\]"
a.underline = "\\[\x1b[4m\\]%s\\[\x1b[24m\\]" a.underline = "\\[\x1b[4m\\]%s\\[\x1b[24m\\]"
a.strikethrough = "\\[\x1b[9m\\]%s\\[\x1b[29m\\]" a.strikethrough = "\\[\x1b[9m\\]%s\\[\x1b[29m\\]"
// escape backslashes to avoid replacements
// https://tldp.org/HOWTO/Bash-Prompt-HOWTO/bash-prompt-escape-sequences.html
a.shellReservedKeywords = append(a.shellReservedKeywords, shellKeyWordReplacement{"\\", "\\\\"})
default: default:
a.linechange = "\x1b[%d%s" a.linechange = "\x1b[%d%s"
a.right = "\x1b[%dC" a.right = "\x1b[%dC"
@ -102,6 +113,8 @@ func (a *ansiUtils) init(shell string) {
a.underline = "\x1b[4m%s\x1b[24m" a.underline = "\x1b[4m%s\x1b[24m"
a.strikethrough = "\x1b[9m%s\x1b[29m" a.strikethrough = "\x1b[9m%s\x1b[29m"
} }
// common replacement for all shells
a.shellReservedKeywords = append(a.shellReservedKeywords, shellKeyWordReplacement{"`", "'"})
} }
func (a *ansiUtils) lenWithoutANSI(text string) int { func (a *ansiUtils) lenWithoutANSI(text string) int {
@ -187,18 +200,8 @@ func (a *ansiUtils) clearAfter() string {
func (a *ansiUtils) escapeText(text string) string { func (a *ansiUtils) escapeText(text string) string {
// what to escape/replace is different per shell // what to escape/replace is different per shell
// maybe we should refactor and maintain a list of characters to escap/replace for _, s := range a.shellReservedKeywords {
// like we do in ansi.go for ansi codes text = strings.ReplaceAll(text, s.text, s.replacement)
switch a.shell {
case zsh:
// escape double quotes
text = strings.ReplaceAll(text, "\"", "\"\"")
case bash:
// escape backslashes to avoid replacements
// https://tldp.org/HOWTO/Bash-Prompt-HOWTO/bash-prompt-escape-sequences.html
text = strings.ReplaceAll(text, "\\", "\\\\")
} }
// escape backtick
text = strings.ReplaceAll(text, "`", "'")
return text return text
} }