fix(autocomplete): zsh double space bug (#687)

Author: kindermoumoute

internal/core/autocomplete.go

@@ -431,18 +431,3 @@ func keySuggestion(key, keySchema string, completedArg map[string]struct{}) stri
 	}
 	return strings.ReplaceAll(key, "([0-9]+)", strconv.Itoa(i))
 }
-
-func WordIndex(charIndex int, words []string) int {
-	wordIndex := len(words)
-	charCount := 0
-	for i, word := range words {
-		charCount += len(word)
-		if charIndex <= charCount {
-			wordIndex = i
-			break
-		}
-
-		charCount++ // space character
-	}
-	return wordIndex
-}

internal/core/autocomplete_test.go

@@ -143,33 +143,3 @@ func TestAutocomplete(t *testing.T) {
 	t.Run("scw test --profile xxxx flower create name=p ", run(&testCase{Suggestions: AutocompleteSuggestions{"colours.0=", "leaves.0.size=", "size=", "species="}}))
 	t.Run("scw test flower create name=p --profile xxxx", run(&testCase{Suggestions: nil}))
 }
-
-func TestWordIndex(t *testing.T) {
-	type testCase struct {
-		CharIndex int
-		Words     []string
-		WordIndex int
-	}
-
-	run := func(tc *testCase) func(*testing.T) {
-		return func(t *testing.T) {
-			words := tc.Words
-			if len(words) == 0 {
-				name := strings.ReplaceAll(t.Name(), "TestWordIndex/", "")
-				name = strings.ReplaceAll(name, " ", "_")
-				words = strings.Split(name, "_")
-			}
-
-			assert.Equal(t, tc.WordIndex, WordIndex(tc.CharIndex, words))
-		}
-	}
-
-	t.Run("scw", run(&testCase{CharIndex: 3, WordIndex: 0}))
-	t.Run("scw ", run(&testCase{CharIndex: 3, WordIndex: 0}))
-	t.Run("scw ", run(&testCase{CharIndex: 4, WordIndex: 1}))
-	t.Run("scw plop", run(&testCase{CharIndex: 4, WordIndex: 1}))
-	t.Run("scw plop", run(&testCase{CharIndex: 8, WordIndex: 1}))
-	t.Run("scw in security-groups list", run(&testCase{CharIndex: 6, WordIndex: 1}))
-	t.Run("scw in security-groups list", run(&testCase{CharIndex: 27, WordIndex: 3}))
-	t.Run("scw in security-groups list ", run(&testCase{CharIndex: 28, WordIndex: 4}))
-}

internal/namespaces/autocomplete/autocomplete.go

@@ -98,22 +98,7 @@ var autocompleteScripts = map[string]autocompleteScript{
 		CompleteFunc: `
 			autoload -U compinit && compinit
 			_scw () {
-				# splits $BUFFER, i.e. the complete command line,
-				# into shell words using shell parsing rules by Expansion Flag (z) and puts it into an array
-				words=("${(z)BUFFER}")
-
-				# If the last char of the line is a space, a last empty word is not added to words.
-				# We need to add it manually.
-				lastChar="${BUFFER: -1}"
-				if [[ $lastChar = *[!\ ]* ]]; then # if $lastChar contains something else than spaces
-					: # do nothing
-				else
-					# words+=('') does not work
-					# couldn't find a way to add an empty string to an array
-					# we replace 'EMPTY_WORD' by '' later in go code
-					words+=('EMPTY_WORD')
-				fi
-				output=($(scw autocomplete complete zsh -- $CURSOR $words))
+				output=($(scw autocomplete complete zsh -- ${CURRENT} ${words}))
 				opts=('-S' ' ')
 				if [[ $output == *= ]]; then
 					opts=('-S' '')
@@ -316,26 +301,22 @@ func autocompleteCompleteZshCommand() *core.Command {
 		Run: func(ctx context.Context, argsI interface{}) (i interface{}, e error) {
 			rawArgs := *argsI.(*args.RawArgs)
 
-			words := rawArgs[1:]
-			charIndex, err := strconv.Atoi(rawArgs[0])
+			// First arg is the word index.
+			wordIndex, err := strconv.Atoi(rawArgs[0])
 			if err != nil {
 				return nil, err
 			}
-			wordIndex := core.WordIndex(charIndex, words)
-			leftWords := words[:wordIndex]
-			wordToComplete := words[wordIndex]
+			wordIndex-- // In zsh word index starts at 1.
 
-			// In zsh, couldn't find a way to add an empty string to an array.
-			// We added "EMPTY_WORD" instead.
-			// "EMPTY_WORD" is replaced by "".
-			// see the zsh script, line 106:
-			//     words+=('EMPTY_WORD')
-			if wordToComplete == "EMPTY_WORD" {
-				wordToComplete = ""
+			// Other args are all the words.
+			words := rawArgs[1:]
+			if len(words) <= wordIndex {
+				words = append(words, "") // Handle case when last word is empty.
 			}
 
-			// TODO: compute rightWords once used by core.AutoComplete()
-			rightWords := []string(nil)
+			leftWords := words[:wordIndex]
+			wordToComplete := words[wordIndex]
+			rightWords := words[wordIndex+1:]
 
 			res := core.AutoComplete(ctx, leftWords, wordToComplete, rightWords)
 			return strings.Join(res.Suggestions, " "), nil