search:NONE

Author: jayli

autoload/easycomplete/popup.vim

@@ -633,7 +633,7 @@ function! s:NVimShow(opt, windowtype, float_type)
   noa let winid = nvim_open_win(s:buf[a:windowtype], v:false, opt)
   let g:easycomplete_popup_win[a:windowtype] = winid
   if a:windowtype == "popup" || (a:windowtype == "float" && a:float_type == "signature")
-    call setwinvar(winid, '&winhl', 'Normal:Pmenu,NormalNC:Pmenu,Search:Normal,Error:Pmenu')
+    call setwinvar(winid, '&winhl', 'Normal:Pmenu,NormalNC:Pmenu,Search:Normal,Error:Pmenu,Search:NONE')
     call setwinvar(winid, '&spell', 0)
   elseif a:windowtype == "float" && a:float_type == "lint"
     let bgcolor = easycomplete#ui#GetBgColor("CursorLine")
@@ -642,11 +642,10 @@ function! s:NVimShow(opt, windowtype, float_type)
       let fgcolor = easycomplete#ui#GetFgColor("Comment")
     endif
     call easycomplete#ui#hi("EasyLintStyle", fgcolor, bgcolor, "")
-    call setwinvar(winid, '&winhl', 'Normal:Pmenu,NormalNC:EasyLintStyle')
+    call setwinvar(winid, '&winhl', 'Normal:Pmenu,NormalNC:EasyLintStyle,Search:NONE')
   else
-    call setwinvar(winid, '&winhl', 'Normal:Pmenu,NormalNC:Pmenu')
+    call setwinvar(winid, '&winhl', 'Normal:Pmenu,NormalNC:Pmenu,Search:NONE')
   endif
-  " call setwinvar(winid, '&hlsearch', 0)
   if has('nvim-0.5.0')
     call setwinvar(g:easycomplete_popup_win[a:windowtype], '&scrolloff', 0)
     call setwinvar(g:easycomplete_popup_win[a:windowtype], '&spell', 0)

autoload/easycomplete/pum.vim

@@ -662,7 +662,7 @@ function! s:OpenFloatWindow(buf, opts, hl)
   call setwinvar(winid, '&number', 0)
   call setwinvar(winid, '&wrap', 0)
   call setwinvar(winid, '&signcolumn', "no")
-  call setwinvar(winid, '&hlsearch', 0)
+  " call setwinvar(winid, '&hlsearch', 0)
   call setwinvar(winid, '&list', 0)
   call setwinvar(winid, '&conceallevel', 3)
   if exists("&pumblend")
@@ -686,7 +686,7 @@ function! s:RenderScrollBar()
   let scrollbar_opts = deepcopy(s:default_scroll_bar_pot)
   call extend(scrollbar_opts, pos)
   if empty(s:scrollbar_window)
-    let hl = "Normal:PmenuSbar,NormalNC:PmenuSbar,CursorLine:PmenuSbar"
+    let hl = "Normal:PmenuSbar,NormalNC:PmenuSbar,CursorLine:PmenuSbar:Search:NONE"
     let s:scrollbar_window = s:OpenFloatWindow(s:scrollbar_buffer, scrollbar_opts, hl)
   else
     " update scroll window