syntax: adjust context after ((...)) and [[ ... ]] in bash-5.2

akinomyoga · Feb 19, 2023 · 57d7674 · 57d7674
1 parent 9a24b1e
commit 57d7674
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/core-syntax.sh b/lib/core-syntax.sh
@@ -2792,7 +2792,7 @@ function ble/syntax:bash/ctx-command/check-word-end {
       # 条件コマンド開始
       ble/syntax/parse/touch-updated-attr "$wbeg"
       ((_ble_syntax_attr[wbeg]=ATTR_DEL,
-        ctx=CTX_ARGX0))
+        ctx=_ble_bash>=50200?CTX_CMDXE:CTX_ARGX0))
 
       ble/syntax/parse/word-cancel # 単語 "[[" (とその内部のノード全て) を削除
       if [[ $word == '[[' ]]; then
@@ -3045,7 +3045,7 @@ function ble/syntax:bash/ctx-command/.check-delimiter-or-redirect {
     local m=${BASH_REMATCH[0]}
     if ((ctx==CTX_CMDX||ctx==CTX_CMDX1||ctx==CTX_CMDXT||ctx==CTX_CMDXC)); then
       ((_ble_syntax_attr[i]=ATTR_DEL))
-      ((ctx=CTX_ARGX0))
+      ((ctx=_ble_bash>=50200||${#m}==1?CTX_CMDXE:CTX_ARGX0))
       [[ $_ble_syntax_bash_is_command_form_for && $tail == '(('* ]] && ((ctx=CTX_CMDXD0))
       ble/syntax/parse/nest-push $((${#m}==1?CTX_CMDX1:CTX_EXPR)) "$m"
       ((i+=${#m}))