averello/vim-ingo-library-mirror
1
0
Fork 0
mirror of https://github.com/inkarkat/vim-ingo-library.git synced 2026-05-29 11:18:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Factor our s:ResolveDirspec()

Browse Source
This commit is contained in:
Ingo Karkat
2017-01-26 00:00:00 +01:00
parent 9a779ece36
commit 06140a2231
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
autoload/ingo/plugin/cmdcomplete/CommandCompleteDirForAction.vim
+6 -2
View File
@@ -40,6 +40,7 @@
" Maintainer: Ingo Karkat <ingo@karkat.de>
"
" REVISION DATE REMARKS
" 027 26-Jan-2017 Factor our s:ResolveDirspec().
" 026 02-Apr-2015 Emulate lower priority of filespecs matching
" 'suffixes' via custom s:SuffixesSort() function,
" and use that when multiple glob() results have
@@ -153,9 +154,12 @@ function! s:RemoveDirspec( filespec, dirspecs )
endfor
return a:filespec
endfunction
function! s:ResolveDirspec( dirspec )
return (type(a:dirspec) == type(function('tr')) ? call(a:dirspec, []) : a:dirspec)
endfunction
function! s:CompleteFiles( dirspec, browsefilter, wildignore, isIncludeSubdirs, argLead )
try
let l:dirspec = (type(a:dirspec) == 2 ? call(a:dirspec, []) : a:dirspec)
let l:dirspec = s:ResolveDirspec(a:dirspec)
catch /^Vim\%((\a\+)\)\=:E/
throw ingo#msg#MsgFromVimException() " Don't swallow Vimscript errors.
catch /^Vim\%((\a\+)\)\=:/
@@ -267,7 +271,7 @@ endfunction
function! s:Command( isBang, Action, PostAction, DefaultFilename, FilenameProcessingFunction, FilespecProcessingFunction, dirspec, filename )
try
"****Dechomsg '****' a:isBang string(a:Action) string(a:PostAction) string(a:DefaultFilename) string(a:FilenameProcessingFunction) string(a:FilespecProcessingFunction) string(a:dirspec) string(a:filename)
let l:dirspec = (type(a:dirspec) == 2 ? call(a:dirspec, []) : a:dirspec)
let l:dirspec = s:ResolveDirspec(a:dirspec)
" Detach any file options or commands for assembling the filespec.
let [l:fileOptionsAndCommands, l:filename] = ingo#cmdargs#file#FilterEscapedFileOptionsAndCommands(a:filename)