\ '+': ':call <SID>NM_search_add_tags([])<CR>',
\ '-': ':call <SID>NM_search_remove_tags([])<CR>',
\ '=': ':call <SID>NM_search_refresh_view()<CR>',
- \ '?': ':echo <SID>NM_search_thread_id()<CR>',
+ \ '?': ':echo <SID>NM_search_thread_id() . '' @ '' . join(<SID>NM_get_search_words())<CR>',
\ }
" --- --- bindings for show screen {{{2
\
\ 'r': ':call <SID>NM_show_reply()<CR>',
\ 'm': ':call <SID>NM_new_mail()<CR>',
- \ '?': ':echo <SID>NM_show_message_id() . '' @ '' . join(<SID>NM_show_search_words())<CR>',
+ \ '?': ':echo <SID>NM_show_message_id() . '' @ '' . join(<SID>NM_get_search_words())<CR>',
\ }
" --- --- bindings for compose screen {{{2
if id != ''
let words = [id]
if exists('b:nm_search_words')
- let words = ['('] + b:nm_search_words + [')', 'and', id]
+ let words = ['('] + b:nm_search_words + [')', 'AND', id]
endif
if len(words)
call <SID>NM_cmd_show(words)
function! s:NM_search_filter_helper(prompt, prefix, joiner)
" TODO: input() can support completion
- let text = input(a:prompt)
+ let text = substitute(input(a:prompt), '\v(^\s*|\s*$|\n)', '', 'g')
if !strlen(text)
return
endif
- let tags = split(text)
- if strlen(a:prefix)
- call map(tags, 'a:prefix . v:val')
- endif
- if strlen(a:joiner)
- let idx = len(tags) - 1
- while idx > 0
- call insert(tags, a:joiner, idx)
- let idx = idx - 1
- endwhile
- endif
- let tags = b:nm_search_words + ['and', '('] + tags + [')']
+ let tags = b:nm_search_words + ['AND']
+ \ + <SID>NM_combine_tags(a:prefix, split(text), a:joiner, '()')
let prev_bufnr = bufnr('%')
setlocal bufhidden=hide
setlocal bufhidden=hide
call <SID>NM_newBuffer('', 'show', join(info['disp'], "\n"))
setlocal bufhidden=delete
- let b:nm_words = a:words
+ let b:nm_search_words = a:words
let b:nm_raw_info = info
let b:nm_prev_bufnr = prev_bufnr
let ids = []
for msg in b:nm_raw_info['msgs']
if has_key(msg,'match') && msg['match'] != '0'
- if len(ids)
- call add(ids, 'OR')
- endif
call add(ids, msg['id'])
endif
endfor
-
- let filter = ['('] + advance_tags + [')', 'AND', '('] + ids + [')']
+ let filter = <SID>NM_combine_tags('tag:', advance_tags, 'OR', '()')
+ \ + ['AND']
+ \ + <SID>NM_combine_tags('', ids, 'OR', '()')
call <SID>NM_add_remove_tags(filter, '-', advance_tags)
call <SID>NM_show_next(1, 1)
return
if has_key(msg_top,'match') && msg_top['match'] != '0'
redraw
" do this last to hide the latency
- let filter = ['('] + advance_tags + [')', 'AND', msg_top['id']]
+ let filter = <SID>NM_combine_tags('tag:', advance_tags, 'OR', '()')
+ \ + ['AND', msg_top['id']]
call <SID>NM_add_remove_tags(filter, '-', advance_tags)
endif
return
return ''
endfunction
-function! s:NM_show_search_words()
- if !exists('b:nm_words')
- throw 'Eeek! no b:nm_words'
- endif
- return b:nm_words
-endfunction
-
function! s:NM_show_fold_toggle(key, type, fold)
let info = b:nm_raw_info
let act = 'open'
echo 'not implemented'
endfunction
+" --- tag manipulation helpers {{{1
+
+" used to combine an array of words with prefixes and separators
+" example:
+" NM_combine_tags('tag:', ['one', 'two', 'three'], 'OR', '()')
+" -> ['(', 'tag:one', 'OR', 'tag:two', 'OR', 'tag:three', ')']
+function s:NM_combine_tags(word_prefix, words, separator, brackets)
+ let res = []
+ for word in a:words
+ if len(res) && strlen(a:separator)
+ call add(res, a:separator)
+ endif
+ call add(res, a:word_prefix . word)
+ endfor
+ if len(res) > 1 && strlen(a:brackets)
+ if strlen(a:brackets) != 2
+ throw 'Eeek! brackets arg to NM_combine_tags must be 2 chars'
+ endif
+ call insert(res, a:brackets[0])
+ call add(res, a:brackets[1])
+ endif
+ return res
+endfunction
+
" --- other helpers {{{1
+function! s:NM_get_search_words()
+ if !exists('b:nm_search_words')
+ throw 'Eeek! no b:nm_search_words'
+ endif
+ return b:nm_search_words
+endfunction
+
function! s:NM_kill_this_buffer()
if exists('b:nm_prev_bufnr')
let prev_bufnr = b:nm_prev_bufnr