add custom pum support with border #360, #359add custom pum support with

border #360, #359

Author: jayli

README-cn.md

@@ -169,6 +169,7 @@ noremap gb :BackToOriginalBuffer<CR>
 | `g:easycomplete_menu_abbr`           | 1             | 匹配菜单里menu字段是否显示简写，否则显示全称                |
 | `g:easycomplete_custom_snippet`      | `""`          | 自定义 snippets 路径                                        |
 | `g:easycomplete_use_default_cr`      | 1             | 是否使用默认回车的事件绑定                                  |
+| `g:easycomplete_pum_pretty_style`    | 1             | 开启 border 时自适应 pum 样式                               |
 
 ## 语言支持
 
@@ -365,7 +366,7 @@ You can add custom Pmenu styles by defining these highlight groups:
 - `EasyTabNine`: TabNine 图标样式. 默认link到 "Character".
 - `EasySnippets`: 行内补全样式. 默认link到 "LineNr"
 
-当 `g:easycomplete_winborder` 设置为 `1`. Pmenu 匹配菜单的背景色会设置成和文档背景色一致。
+当 `g:easycomplete_winborder` 设置为 `1`. Pmenu 匹配菜单的背景色会自动设置成和文档背景色一致。如果你不想被自动设置 pum 背景色，可以这样关掉: `let g:easycomplete_pum_pretty_style = 0`，然后定义新的“Pmenu, FloatBorder, PmenuExtra, PmenuKind” 等样式。
 
 更多例子: [例子](custom-config.md)
 

README.md

@@ -174,6 +174,7 @@ Global configurations:
 | `g:easycomplete_menu_abbr`           | 1             | Show abbr(shortname) at pum `menu` position, or show fullname |
 | `g:easycomplete_custom_snippet`      | `""`          | Custom snippets path                                          |
 | `g:easycomplete_use_default_cr`      | 1             | enable or disable default cr action                           |
+| `g:easycomplete_pum_pretty_style`    | 1             | Adjust the pum style with border automatically                |
 
 Typing `:h easycomplete` for help.
 
@@ -374,7 +375,7 @@ You can add custom Pmenu styles by defining these highlight groups:
 - `EasyTabNine`: TabNine kind icon style. links to "Character" by default.
 - `EasySnippets`: TabNine snippets suggestion style. links to "LineNr" by default
 
-When `g:easycomplete_winborder` is set to `1`. The guibg of Pmenu will be set to be the same as the Normal guibg.
+When `g:easycomplete_winborder` is set to `1`. The guibg of Pmenu will be set to be the same as the Normal guibg automatically. If you want to redefine pum style, disable the auto setting by `let g:easycomplete_pum_pretty_style = 0`. Then define these highlight group: "FloatBorder, Pmenu, PmenuExtra, PmenuKind" etc.
 
 More examples here: [full config example](custom-config.md)
 

autoload/easycomplete/popup.vim

@@ -21,6 +21,7 @@ let s:is_vim = !has('nvim')
 let s:is_nvim = has('nvim')
 " signature/lint
 let s:float_type = ""
+let s:hlsearch = &hlsearch
 
 augroup easycomplete#popup#au
   autocmd!
@@ -632,7 +633,8 @@ 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')
+    call setwinvar(winid, '&winhl', 'Normal:Pmenu,NormalNC:Pmenu,Search:Normal,Error:Pmenu')
+    call setwinvar(winid, '&spell', 0)
   elseif a:windowtype == "float" && a:float_type == "lint"
     let bgcolor = easycomplete#ui#GetBgColor("CursorLine")
     let fgcolor = s:GetSignGuifgAtCurrentLine()

autoload/easycomplete/pum.vim

@@ -152,6 +152,7 @@ function! s:hl()
           \ "hi link CustomSnippet  " . snippet_hl_group,
           \ "hi link CustomTabNine  " . tabnine_hl_group,
           \ "hi link CustomNormal   " . pmenu_hl_group,
+          \ "hi link Error Pmenu",
           \ ]
           " \ "hi Search guibg=NONE guifg=NONE ctermbg=NONE ctermfg=NONE",
   endif

autoload/easycomplete/ui.vim

@@ -148,12 +148,14 @@ function! easycomplete#ui#HighlightWordUnderCursor() " {{{
 endfunction
 
 function! easycomplete#ui#HiFloatBorder()
-  let l:bg = easycomplete#ui#GetBgColor("Normal")
-  call easycomplete#ui#hi("Pmenu", "", l:bg, {})
-  call easycomplete#ui#hi("FloatBorder", "", l:bg, {})
-  call easycomplete#ui#hi("PmenuSBar", "", l:bg, {})
-  call easycomplete#ui#hi("PmenuExtra", "", l:bg, {})
-  call easycomplete#ui#hi("PmenuKind", "", l:bg, {})
+  if g:easycomplete_pum_pretty_style == 1
+    let l:bg = easycomplete#ui#GetBgColor("Normal")
+    call easycomplete#ui#hi("Pmenu", "", l:bg, {})
+    call easycomplete#ui#hi("FloatBorder", "", l:bg, {})
+    call easycomplete#ui#hi("PmenuSBar", "", l:bg, {})
+    call easycomplete#ui#hi("PmenuExtra", "", l:bg, {})
+    call easycomplete#ui#hi("PmenuKind", "", l:bg, {})
+  endif
 endfunction
 
 function! s:IsSearchWord()

plugin/easycomplete.vim

@@ -126,6 +126,9 @@ endif
 if !exists("g:easycomplete_use_default_cr")
   let g:easycomplete_use_default_cr = 1
 endif
+if !exists("g:easycomplete_pum_pretty_style")
+  let g:easycomplete_pum_pretty_style = 1
+endif
 if !exists("g:easycomplete_lsp_type_font")
   let g:easycomplete_lsp_type_font = {}
 endif