highlight: fix unhighlighted tilde expansions "~+"

akinomyoga · Dec 2, 2020 · 1f9abf6 · 1f9abf6
1 parent 0f85719
commit 1f9abf6
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/lib/core-syntax.sh b/lib/core-syntax.sh
@@ -2397,8 +2397,8 @@ function ble/syntax:bash/check-tilde-expansion {
   if ((tilde_enabled)); then
     local chars="${_ble_syntax_bash_chars[CTX_ARGI]}/:"
     ble/syntax:bash/cclass/update/reorder chars
-    local delimiters="$_ble_syntax_bash_IFS;|&()<>"
-    local rex='^(~[^'$chars']*)([^'$delimiters'/:]?)'; [[ $tail =~ $rex ]]
+    local delimiters="$_ble_syntax_bash_IFS;|&)<>"
+    local rex='^(~\+|~[^'$chars']*)([^'$delimiters'/:]?)'; [[ $tail =~ $rex ]]
     local str=${BASH_REMATCH[1]}
 
     local path attr=$ctx
@@ -2413,6 +2413,12 @@ function ble/syntax:bash/check-tilde-expansion {
         ble/util/assert 'ble/util/unlocal tail; [[ $tail == ":~"* ]]'
         ble/syntax/parse/nest-pop
       fi
+    else
+      # ~+ で始まってかつ有効なチルダ展開ではない時 ~ まで後退 (#D1424)
+      if [[ $str == '~+' ]]; then
+        ble/syntax/parse/set-lookahead 3
+        str='~'
+      fi
     fi
     ((_ble_syntax_attr[i]=attr,i+=${#str}))
   else