awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improved ZSH completion (#535) 

Signed-off-by: Arvydas Sidorenko <asido4@gmail.com>
Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Arvydas Sidorenko 2012-05-06 23:35:07 +02:00 committed by Uli Schlachter
parent 1730d4f1ea
commit 3986409e70
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/awful/completion.lua.in
View File

@ -12,6 +12,7 @@ local table = table
local math = math local math = math
local print = print local print = print
local pairs = pairs local pairs = pairs
local string = string
local util = require("awful.util") local util = require("awful.util")
--- Completion module. --- Completion module.
@ -88,21 +89,22 @@ function shell(command, cur_pos, ncomp, shell)
i = i + 1 i = i + 1
end end
if cword_index == 1 then if cword_index == 1 and not string.find(words[cword_index], "/") then
comptype = "command" comptype = "command"
end end
local shell_cmd local shell_cmd
if shell == "zsh" or (not shell and os.getenv("SHELL"):match("zsh$")) then if shell == "zsh" or (not shell and os.getenv("SHELL"):match("zsh$")) then
if comptype == "file" then if comptype == "file" then
shell_cmd = "/usr/bin/env zsh -c 'local -a res; res=( " .. words[cword_index] .. "* ); print -l -- ${res[@]}'" shell_cmd = "/usr/bin/env zsh -c 'local -a res; res=( " .. words[cword_index] .. "* ); print -ln -- ${res[@]}'"
else else
-- check commands, aliases, builtins, functions and reswords -- check commands, aliases, builtins, functions and reswords
shell_cmd = "/usr/bin/env zsh -c 'local -a res; ".. shell_cmd = "/usr/bin/env zsh -c 'local -a res; "..
"res=( ".. "res=( "..
"\"${(k)commands[@]}\" \"${(k)aliases[@]}\" \"${(k)builtins[@]}\" \"${(k)functions[@]}\" \"${(k)reswords[@]}\" ".. "\"${(k)commands[@]}\" \"${(k)aliases[@]}\" \"${(k)builtins[@]}\" \"${(k)functions[@]}\" \"${(k)reswords[@]}\" "..
"${PWD}/*(:t)"..
"); ".. "); "..
"print -l -- ${(M)res[@]:#"..words[cword_index].."*}'" "print -ln -- ${(M)res[@]:#"..words[cword_index].."*}'"
end end
else else
if bashcomp_funcs[words[1]] then if bashcomp_funcs[words[1]] then