zsh: fix quoting state

carapace-sh · Jan 19, 2025 · a5fa547 · a5fa547
1 parent c9cfc31
commit a5fa547
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 8 deletions.
diff --git a/docs/src/development/vhs/doubleQuoteOpen/out/doubleQuoteOpen.zsh.ascii b/docs/src/development/vhs/doubleQuoteOpen/out/doubleQuoteOpen.zsh.ascii
@@ -22,15 +22,15 @@
 
 
 ────────────────────────────────────────────────────────────────────────────────
-> example action embeddedP1 "embeddedP2\ with\ space
+> example action embeddedP1 "embeddedP2\ with\ space"
 
 
 
 
 
 
 ────────────────────────────────────────────────────────────────────────────────
-> example action embeddedP1 "embeddedP2\ with\ space
+> example action embeddedP1 "embeddedP2\ with\ space"
 
 
 

diff --git a/docs/src/development/vhs/singleQuoteOpen/out/singleQuoteOpen.zsh.ascii b/docs/src/development/vhs/singleQuoteOpen/out/singleQuoteOpen.zsh.ascii
@@ -22,15 +22,15 @@
 
 
 ────────────────────────────────────────────────────────────────────────────────
-> example action embeddedP1 'embeddedP2\ with\ space
+> example action embeddedP1 'embeddedP2\ with\ space'
 
 
 
 
 
 
 ────────────────────────────────────────────────────────────────────────────────
-> example action embeddedP1 'embeddedP2\ with\ space
+> example action embeddedP1 'embeddedP2\ with\ space'
 
 
 

diff --git a/example/cmd/_test/zsh.sh b/example/cmd/_test/zsh.sh
@@ -7,9 +7,9 @@ function _example_completion {
   if echo ${words}"''" | xargs echo 2>/dev/null > /dev/null; then
     local lines="$(echo ${words}"''" | CARAPACE_ZSH_HASH_DIRS="$(hash -d)" xargs example _carapace zsh )"
   elif echo ${words} | sed "s/\$/'/" | xargs echo 2>/dev/null > /dev/null; then
-    local lines="$(echo ${words} | sed "s/\$/'/" | CARAPACE_ZSH_HASH_DIRS="$(hash -d)" xargs example _carapace zsh)"
+    local lines="$(echo ${words} | sed "s/\$/'/" | CARAPACE_STATE=QUOTING_STATE CARAPACE_ZSH_HASH_DIRS="$(hash -d)" xargs example _carapace zsh)"
   else
-    local lines="$(echo ${words} | sed 's/$/"/' | CARAPACE_ZSH_HASH_DIRS="$(hash -d)" xargs example _carapace zsh)"
+    local lines="$(echo ${words} | sed 's/$/"/' | CARAPACE_STATE=QUOTING_ESCAPING_STATE CARAPACE_ZSH_HASH_DIRS="$(hash -d)" xargs example _carapace zsh)"
   fi
 
   local zstyle message data

diff --git a/internal/shell/zsh/action.go b/internal/shell/zsh/action.go
@@ -2,6 +2,7 @@ package zsh
 
 import (
 	"fmt"
+	"os"
 	"strings"
 
 	"github.com/carapace-sh/carapace/internal/common"
@@ -63,6 +64,16 @@ func ActionRawValues(currentWord string, meta common.Meta, values common.RawValu
 			val.Value = quoteValue(val.Value)
 			val.Value = strings.ReplaceAll(val.Value, `\`, `\\`) // TODO find out why `_describe` needs another backslash
 			val.Value = strings.ReplaceAll(val.Value, `:`, `\:`) // TODO find out why `_describe` needs another backslash
+
+			switch os.Getenv("CARAPACE_STATE") {
+			// TODO depending on state value needs to be formatted differently
+			// TODO backspace strings are currently an issue
+			case "QUOTING_STATE":
+				val.Value = val.Value + `'`
+			case "QUOTING_ESCAPING_STATE":
+				val.Value = val.Value + `"`
+			}
+
 			if !meta.Nospace.Matches(val.Value) {
 				val.Value = val.Value + " "
 			}

diff --git a/internal/shell/zsh/snippet.go b/internal/shell/zsh/snippet.go
@@ -19,9 +19,9 @@ function _%v_completion {
   if echo ${words}"''" | xargs echo 2>/dev/null > /dev/null; then
     local lines="$(echo ${words}"''" | CARAPACE_ZSH_HASH_DIRS="$(hash -d)" xargs %v _carapace zsh )"
   elif echo ${words} | sed "s/\$/'/" | xargs echo 2>/dev/null > /dev/null; then
-    local lines="$(echo ${words} | sed "s/\$/'/" | CARAPACE_ZSH_HASH_DIRS="$(hash -d)" xargs %v _carapace zsh)"
+    local lines="$(echo ${words} | sed "s/\$/'/" | CARAPACE_STATE=QUOTING_STATE CARAPACE_ZSH_HASH_DIRS="$(hash -d)" xargs %v _carapace zsh)"
   else
-    local lines="$(echo ${words} | sed 's/$/"/' | CARAPACE_ZSH_HASH_DIRS="$(hash -d)" xargs %v _carapace zsh)"
+    local lines="$(echo ${words} | sed 's/$/"/' | CARAPACE_STATE=QUOTING_ESCAPING_STATE CARAPACE_ZSH_HASH_DIRS="$(hash -d)" xargs %v _carapace zsh)"
   fi
 
   local zstyle message data