Skip to content
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

Pass 'nosort' parameter to external match function #359

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Pass 'nosort' parameter to external match function #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9eb14b9
Pass 'nosort' parameter to external match function
pjkack Oct 30, 2016
fa34bdc
Merge remote-tracking branch 'upstream/master'
pjkack Apr 8, 2017
adfc2fc
Don't pass nosort when calling matcher with a list
pjkack Jan 26, 2020
402902d
Merge remote-tracking branch 'upstream/master'
pjkack Jan 26, 2020
1493d0c
Merge remote-tracking branch 'upstream/master'
pjkack Aug 21, 2021
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
11 changes: 8 additions & 3 deletions autoload/ctrlp.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,6 +678,7 @@ fu! s:MatchedItems(items, pat, limit)
\ 'ispath': s:ispath,
\ 'crfile': exc,
\ 'regex': s:regexp,
\ 'nosort': s:matchernosort(),
\ }] : [items, a:pat, a:limit, s:mmode(), s:ispath, exc, s:regexp]
let lines = call(matcher['match'], argms, matcher)
el
Expand Down Expand Up @@ -739,7 +740,7 @@ fu! s:Render(lines, pat)
en
let s:matched = copy(lines)
" Sorting
if !s:nosort()
if !s:rendernosort()
let s:compat = s:martcs.pat
if has('patch-8.1-0')
cal sort(lines, function('s:mixedsort2', [s:curtype()]))
Expand Down Expand Up @@ -2347,12 +2348,16 @@ fu! s:modevar()
let s:spi = !s:itemtype || s:getextvar('specinput') > 0
endf

fu! s:nosort()
fu! s:matchernosort()
let ct = s:curtype()
retu s:matcher != {} || s:nolim == 1 || ( ct == 'mru' && s:mrudef )
retu ( ct == 'mru' && s:mrudef )
\ || ( ct =~ '^\(buf\|mru\)$' && s:prompt == ['', '', ''] ) || !s:dosort
endf

fu! s:rendernosort()
retu s:matcher != {} || s:nolim == 1 || s:matchernosort()
endf

fu! s:byfname()
retu s:curtype() != 'buf' && s:ispath && s:byfname
endf
Expand Down
6 changes: 6 additions & 0 deletions doc/ctrlp.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,6 +818,12 @@ Structure of the function: >
" | results when a:ispath == 1.
" |
" +- a:regex : In regex mode: 1 or 0.
" |
" +- a:nosort : No sort: 1 or 0. Sorting may be disabled for some plugins.
" | Match function should keep item order when a:nosort == 1.
" | Only available when function is called with a dictionary,
" | see note below.


return list_of_matched_items
endfunction
Expand Down