Skip to content

Avoid non-portable glob pattern in wiki#fzf#pages(). #248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lervag merged 1 commit into from
Oct 11, 2022
+23 −10
Merged

Avoid non-portable glob pattern in wiki#fzf#pages(). #248

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 23 additions & 10 deletions autoload/wiki/fzf.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,7 @@ function! wiki#fzf#pages() abort "{{{1
return
endif

let l:root = wiki#get_root() . s:slash
let l:extension = len(g:wiki_filetypes) == 1
\ ? g:wiki_filetypes[0]
\ : '{' . join(g:wiki_filetypes, ',') . '}'
let l:pages = globpath(l:root, '**/*.' . l:extension, v:false, v:true)
call map(l:pages, {_, x -> x . '#####'
\ .'/' . fnamemodify(
\ substitute(x, '\V' . escape(l:root, '\'), '', ''),
\ ':r')
\})
let l:pages = s:gather_files()

let l:fzf_opts = join([
\ '-d"#####" --with-nth=-1 --print-query --prompt "WikiPages> "',
Expand Down Expand Up @@ -88,6 +79,28 @@ endfunction

"}}}1

function! s:gather_files() abort "{{{1
let l:root = wiki#get_root() . s:slash
let l:pages = []
" Note: It is tempting to do a globpath with a single pattern
" `**/*.{ext1,ext2,...}`, but this is not portable. On at least
" some very common systems, brace-expansion is incompatible with
" recursive `**` globbing and turns the latter into a
" non-recursive `*`.
for l:extension in g:wiki_filetypes
let l:pages += globpath(l:root, '**/*.' . l:extension, v:false, v:true)
endfor
call map(l:pages, {_, x -> x . '#####'
\ .'/' . fnamemodify(
\ substitute(x, '\V' . escape(l:root, '\'), '', ''),
\ ':r')
\})
return l:pages
endfunction

let s:slash = exists('+shellslash') && !&shellslash ? '\' : '/'
Copy link
Copy Markdown
Owner

@lervag lervag Oct 11, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems duplicated (see line 28). I propose to remove line 28.


" }}}1
function! s:accept_page(lines) abort "{{{1
" a:lines is a list with two or three elements. Two if there were no matches,
" and three if there is one or more matching names. The first element is the
Expand Down