shy/c4ctrl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Completion bug fixed

Browse source
This commit is contained in:
Shy 2017-04-11 20:07:10 +02:00
parent 07788eb88a
commit 5ca5eb1532
1 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
c4ctrl.vim
View file

@ -204,29 +204,32 @@ function s:C4ctrlCompletion(ArgLead, CmdLine, CursorPos)
" The name of the command we are adding to Vim " The name of the command we are adding to Vim
let command_name = "C4ctrl" let command_name = "C4ctrl"
" A list of current cmd line arguments excluding leading mods like " A list of current cmd line arguments
" :vertical, :tab etc. let command_line = split(a:CmdLine)
let relCmdLine = split(a:CmdLine) " Check out if our name was abbreviated and modify accordingly
" User may have abbreviated our command name while index(command_line, command_name) == -1
while index(relCmdLine, command_name) == -1 let command_name = strpart(command_name, 0, len(command_name) - 1)
let command_name = strpart(command_name, 0, len(command_name)-1)
if len(command_name) == 0 if len(command_name) == 0
" This should never happen, but let's not risk an infinite loop anyway " This should never happen, but let's not risk an infinite loop anyway
return "" return ""
endif endif
endwhile endwhile
let relCmdLine = relCmdLine[index(relCmdLine, command_name):] " Position of our command in the command line
let command_index = index(command_line, command_name)
try " We use the matching finally for cleaning up try " We use the matching finally for cleaning up
if stridx("open", get(relCmdLine, 1)) == 0 if stridx("open", get(command_line, command_index + 1)) == 0 || (len(command_line) == command_index + 1 && a:ArgLead == command_name)
" *************************** " " *************************** "
" Complete the 'open' command " " Complete the 'open' command "
" *************************** " " *************************** "
" ^ Note: the seconds part of the if rule (the part after '||') will
" eval to true if a filename matches our command name better than the
" actually given command name (eg. ':C4 open C4c')
if a:ArgLead != "" if a:ArgLead != ""
if len(relCmdLine) == 2 if len(command_line) == command_index + 2
return "open" return "open"
endif endif
elseif len(relCmdLine) > 2 elseif len(command_line) > command_index + 2
" Do not return more than one file name " Do not return more than one file name
return "" return ""
endif endif
@ -236,7 +239,7 @@ function s:C4ctrlCompletion(ArgLead, CmdLine, CursorPos)
endif endif
return join(map(glob(s:config_dir."*", 0, 1), "fnamemodify(v:val, ':t')"), "\n") return join(map(glob(s:config_dir."*", 0, 1), "fnamemodify(v:val, ':t')"), "\n")
elseif stridx("get", get(relCmdLine, 1)) == 0 elseif stridx("get", get(command_line, command_index + 1)) == 0
" ************************** " " ************************** "
" Complete the 'get' command " " Complete the 'get' command "
" ************************** " " ************************** "
@ -245,7 +248,7 @@ function s:C4ctrlCompletion(ArgLead, CmdLine, CursorPos)
endif endif
return "" return ""
elseif stridx("set", get(relCmdLine, 1)) == 0 elseif stridx("set", get(command_line, command_index + 1)) == 0
" ************************** " " ************************** "
" Complete the 'set' command " " Complete the 'set' command "
" ************************** " " ************************** "
@ -254,7 +257,7 @@ function s:C4ctrlCompletion(ArgLead, CmdLine, CursorPos)
endif endif
return "w\np\nf\n-magic" return "w\np\nf\n-magic"
elseif stridx("text", get(relCmdLine, 1)) == 0 elseif stridx("text", get(command_line, command_index + 1)) == 0
" *************************** " " *************************** "
" Complete the 'text' command " " Complete the 'text' command "
" *************************** " " *************************** "
@ -263,15 +266,18 @@ function s:C4ctrlCompletion(ArgLead, CmdLine, CursorPos)
endif endif
return "" return ""
elseif stridx("write", get(relCmdLine, 1)) == 0 elseif stridx("write", get(command_line, command_index + 1)) == 0 || (len(command_line) == command_index + 1 && a:ArgLead == command_name)
" **************************** " " **************************** "
" Complete the 'write' command " " Complete the 'write' command "
" **************************** " " **************************** "
" ^ Note: the seconds part of the if rule (the part after '||') will
" eval to true if a filename matches our command name better than the
" actually given command name (eg. ':C4 open C4c')
if a:ArgLead != "" if a:ArgLead != ""
if len(relCmdLine) == 2 if len(command_line) == command_index + 2
return "write" return "write"
endif endif
elseif len(relCmdLine) > 2 elseif len(command_line) > command_index + 2
" Do not return more than one file name " Do not return more than one file name
return "" return ""
endif endif
@ -281,7 +287,7 @@ function s:C4ctrlCompletion(ArgLead, CmdLine, CursorPos)
endif endif
return join(map(glob(s:config_dir."*", 0, 1), "fnamemodify(v:val, ':t')"), "\n") return join(map(glob(s:config_dir."*", 0, 1), "fnamemodify(v:val, ':t')"), "\n")
elseif get(relCmdLine, -1) == command_name elseif len(command_line) == command_index + 1
" ************************** " " ************************** "
" Complete the first command " " Complete the first command "
" ************************** " " ************************** "