Merge pull request #270 from rsteube/bash-reenabled-special-characters

bash: re-enabled special characters

Dockerfile

@@ -100,7 +100,6 @@ RUN ln -s /carapace/example/example /usr/local/bin/example
 # bash
 RUN echo -e "\n\
 PS1=$'\e[0;36mcarapace-bash \e[0m'\n\
-source /usr/share/bash-completion/bash_completion \n\
 source <(example _carapace)" \
        > ~/.bashrc
 

internal/bash/action.go

@@ -9,20 +9,33 @@ import (
 )
 
 var sanitizer = strings.NewReplacer(
-	`$`, ``,
-	"`", ``,
 	"\n", ``,
-	`\`, ``,
-	`"`, ``,
-	`'`, ``,
-	`|`, ``,
-	`>`, ``,
-	`<`, ``,
-	`&`, ``,
-	`(`, ``,
-	`)`, ``,
-	`;`, ``,
-	`#`, ``,
+	"\r", ``,
+	"\t", ``,
+)
+
+var quoter = strings.NewReplacer(
+	// seems readline provides quotation only for the filename completion (which would add suffixes) so do that here
+	`&`, `\&`,
+	`<`, `\<`,
+	`>`, `\>`,
+	"`", "\\`",
+	`'`, `\'`,
+	`"`, `\"`,
+	`{`, `\{`,
+	`}`, `\}`,
+	`$`, `\$`,
+	`#`, `\#`,
+	`|`, `\|`,
+	`?`, `\?`,
+	`(`, `\(`,
+	`)`, `\)`,
+	`;`, `\;`,
+	` `, `\ `,
+	`[`, `\[`,
+	`]`, `\]`,
+	`*`, `\*`,
+	`\`, `\\`,
 )
 
 func Sanitize(values ...string) []string {
@@ -33,10 +46,6 @@ func Sanitize(values ...string) []string {
 	return sanitized
 }
 
-func EscapeSpace(s string) string {
-	return strings.Replace(s, " ", `\ `, -1)
-}
-
 func commonPrefix(a, b string) string {
 	i := 0
 	for i < len(a) && i < len(b) && a[i] == b[i] {
@@ -100,7 +109,7 @@ func ActionRawValues(callbackValue string, values ...common.RawValue) string {
 	vals := make([]string, len(filtered))
 	for index, val := range filtered {
 		if len(filtered) == 1 {
-			vals[index] = EscapeSpace(sanitizer.Replace(val.Value))
+			vals[index] = quoter.Replace(sanitizer.Replace(val.Value))
 		} else {
 			if val.Description != "" {
 				vals[index] = fmt.Sprintf("%v (%v)", val.Display, sanitizer.Replace(val.Description))