Highlight the header line for loclist provider

Also move impl.vim to impl/on_typed.vim

Author: liuchengxu

autoload/clap.vim

@@ -101,7 +101,7 @@ function! s:inject_default_impl_is_ok(provider_info) abort
   " If sync provider
   if has_key(provider_info, 'source')
     if !has_key(provider_info, 'on_typed')
-      let provider_info.on_typed = function('clap#impl#on_typed')
+      let provider_info.on_typed = function('clap#impl#on_typed#')
     endif
     if !has_key(provider_info, 'filter')
       let provider_info.filter = function('clap#filter#sync')

autoload/clap/impl.vim autoload/clap/impl/on_typed.vimautoload/clap/impl.vim renamed to autoload/clap/impl/on_typed.vim

@@ -1,5 +1,5 @@
 " Author: liuchengxu <[email protected]>
-" Description: Default implementation for various hooks.
+" Description: Default implementation for on_typed hook.
 
 let s:save_cpo = &cpoptions
 set cpoptions&vim
@@ -182,7 +182,7 @@ endfunction
 "          \
 "           \
 "             on_move
-function! clap#impl#on_typed() abort
+function! clap#impl#on_typed#() abort
   " If user explicitly uses the external filter, just use the async impl then,
   " even the forerunner job is finished already.
   if clap#api#has_externalfilter()

autoload/clap/preview.vim

@@ -159,31 +159,33 @@ endfunction
 
 if has('nvim')
   let s:header_ns_id = nvim_create_namespace('clap_preview_header')
+
+  " lnum is 1-based.
+  function! s:add_highlight_at(lnum) abort
+    if nvim_buf_is_valid(g:clap.preview.bufnr)
+      call nvim_buf_add_highlight(g:clap.preview.bufnr, s:header_ns_id, 'Title', a:lnum - 1, 0, -1)
+    endif
+  endfunction
+
   " Sometimes the first line of preview window is used for the header.
   function! clap#preview#highlight_header() abort
-    " try
-      " let winid = win_getid()
-      " Do not use matchaddpos() as it needs to be executed in that window.
-      " call g:clap.preview.goto_win()
-      " call s:highlight_header()
-      if nvim_buf_is_valid(g:clap.preview.bufnr)
-        call nvim_buf_add_highlight(g:clap.preview.bufnr, s:header_ns_id, 'Title', 0, 0, -1)
-      endif
-    " finally
-      " noautocmd call win_gotoid(winid)
-    " endtry
+    call s:add_highlight_at(1)
   endfunction
 
   function! clap#preview#clear_header_highlight() abort
     call nvim_buf_clear_namespace(g:clap.preview.bufnr, s:header_ns_id, 0, -1)
   endfunction
 else
-  function! s:highlight_header() abort
+  function! s:add_highlight_at(lnum) abort
     if !exists('w:preview_header_id')
-      let w:preview_header_id = matchaddpos('Title', [1])
+      let w:preview_header_id = matchaddpos('Title', [a:lnum])
     endif
   endfunction
 
+  function! s:highlight_header() abort
+    call s:add_highlight_at(1)
+  endfunction
+
   function! s:clear_header_highlight() abort
     if exists('w:preview_header_id')
       call matchdelete(w:preview_header_id)

autoload/clap/provider/loclist.vim

@@ -53,7 +53,7 @@ function! s:loclist.on_move() abort
   let locitem = locations[str2nr(s:locline2idx[curline])]
 
   let lines = []
-  call add(lines, '--> '.bufname(locitem.bufnr).':'.locitem.lnum.':'.locitem.col)
+  call add(lines, bufname(locitem.bufnr).':'.locitem.lnum.':'.locitem.col)
 
   if locitem.lnum !=# ''
     let line = getbufline(locitem.bufnr, str2nr(locitem.lnum))
@@ -77,6 +77,7 @@ function! s:loclist.on_move() abort
 
   call g:clap.preview.show(lines)
   call g:clap.preview.setbufvar('&syntax', getbufvar(locitem.bufnr, '&syntax'))
+  call clap#preview#highlight_header()
 endfunction
 
 let s:loclist.syntax = 'qf'