about summary refs log tree commit diff
path: root/Completion/Base/Core
diff options
context:
space:
mode:
authorPeter Stephenson <p.stephenson@samsung.com>2021-01-27 11:16:55 +0000
committerPeter Stephenson <p.stephenson@samsung.com>2021-01-27 11:16:55 +0000
commit8f42ecd8eecd848ac5a1efdff9d7db15cc89422f (patch)
tree386736f932817fb409db2c36f8c61c52c6549f62 /Completion/Base/Core
parent5d14b6eb71b51911a1083b1c5882f3b3307e9d1b (diff)
downloadzsh-8f42ecd8eecd848ac5a1efdff9d7db15cc89422f.tar.gz
zsh-8f42ecd8eecd848ac5a1efdff9d7db15cc89422f.tar.xz
zsh-8f42ecd8eecd848ac5a1efdff9d7db15cc89422f.zip
47873: Improve completion within dynamic directory names
Diffstat (limited to 'Completion/Base/Core')
-rw-r--r--Completion/Base/Core/_main_complete14
1 files changed, 12 insertions, 2 deletions
diff --git a/Completion/Base/Core/_main_complete b/Completion/Base/Core/_main_complete
index 6b2cf2bcf..663f7557a 100644
--- a/Completion/Base/Core/_main_complete
+++ b/Completion/Base/Core/_main_complete
@@ -94,8 +94,18 @@ if [[ -z "$compstate[quote]" ]]; then
   if [[ -o equals ]] && compset -P 1 '='; then
     compstate[context]=equal
   elif [[ "$PREFIX" != */* && "$PREFIX[1]" = '~' ]]; then
-    compset -p 1
-    compstate[context]=tilde
+    if [[ "$PREFIX" = '~['[^\]]# ]]; then
+      # Inside ~[...] should be treated as a subscript.
+      compset -p 2
+      # To be consistent, we ignore all but the contents of the square
+      # brackets.
+      compset -S '\]*'
+      compstate[context]=subscript
+      [[ -n $_comps[-subscript-] ]] && $_comps[-subscript-] && return
+    else
+      compset -p 1
+      compstate[context]=tilde
+    fi
   fi
 fi