Make bash completion behave normally (#11246)

contrib/completion/hx.bash

@@ -2,23 +2,31 @@
 # Bash completion script for Helix editor
 
 _hx() {
-	# $1 command name
+    local cur prev languages
-	# $2 word being completed
+    COMPREPLY=()
-	# $3 word preceding
+    cur="${COMP_WORDS[COMP_CWORD]}"
+    prev="${COMP_WORDS[COMP_CWORD - 1]}"
 
-	case "$3" in
+    case "$prev" in
     -g | --grammar)
-		COMPREPLY="$(compgen -W 'fetch build' -- $2)"
+        COMPREPLY=($(compgen -W 'fetch build' -- "$cur"))
+        return 0
         ;;
     --health)
-		local languages=$(hx --health |tail -n '+7' |awk '{print $1}' |sed 's/\x1b\[[0-9;]*m//g')
+        languages=$(hx --health | tail -n '+7' | awk '{print $1}' | sed 's/\x1b\[[0-9;]*m//g')
-		COMPREPLY="$(compgen -W """$languages""" -- $2)"
+        COMPREPLY=($(compgen -W """$languages""" -- "$cur"))
+        return 0
+        ;;
+    esac
+
+    case "$2" in
+    -*)
+        COMPREPLY=($(compgen -W "-h --help --tutor -V --version -v -vv -vvv --health -g --grammar --vsplit --hsplit -c --config --log" -- """$2"""))
+        return 0
         ;;
     *)
-		COMPREPLY="$(compgen -fd -W "-h --help --tutor -V --version -v -vv -vvv --health -g --grammar --vsplit --hsplit -c --config --log" -- """$2""")"
+        COMPREPLY=($(compgen -fd -- """$2"""))
+        return 0
         ;;
     esac
-
-	local IFS=$'\n'
-	COMPREPLY=($COMPREPLY)
 } && complete -o filenames -F _hx hx