Merge branch 'dev'

Author: jayli

autoload/easycomplete/sources/path.vim

@@ -120,15 +120,15 @@ function! s:GetWrappedFileAndDirsList(rlist, fpath, base)
         call add(result_with_kind, {"word": item[strwidth(l:pfx):] . "/", "abbr":item, "menu" : dir_menu, "kind": ""})
       else
         call add(result_with_kind, {"word": item[strwidth(l:pfx):] . "/", "abbr":item,
-              \ "menu" : dir_menu, "kind": "" })
+              \ "menu" : dir_menu, "kind": g:easycomplete_lsp_type_font["folder"] })
       endif
     else
       if g:easycomplete_nerd_font == 0
         call add(result_with_kind, {"word": item[strwidth(l:pfx):], "abbr":item,"menu" : file_menu, "kind":""})
       else
         call add(result_with_kind, {"word": item[strwidth(l:pfx):], "abbr": item,
               \ "menu" : file_menu,
-              \ "kind": ""
+              \ "kind": g:easycomplete_lsp_type_font["file"]
               \ })
       endif
     endif

plugin/easycomplete.vim

@@ -30,7 +30,7 @@ endif
 let kind_icons = g:easycomplete_kind_icons
 
 if g:easycomplete_nerd_font == 1
-  let g:easycomplete_menu_skin = {
+  let l_menu_skin = {
         \   "buf": {
         \      "kind":get(kind_icons, "buf", ""),
         \      "menu": g:easycomplete_menu_abbr ? "Text" : "text"
@@ -52,18 +52,27 @@ if g:easycomplete_nerd_font == 1
         \      "menu": g:easycomplete_menu_abbr ? "CMD" : "cmdline"
         \    }
         \ }
-  let g:easycomplete_sign_text = {
-        \   'error':       "",
-        \   'warning':     "",
-        \   'information': '',
-        \   'hint':        ''
-        \ }
+  if !exists("g:easycomplete_menu_skin")
+    let g:easycomplete_menu_skin = l_menu_skin
+  else
+    call extend(l_menu_skin, g:easycomplete_menu_skin)
+    let g:easycomplete_menu_skin = l_menu_skin
+  endif
+
+  if !exists("g:easycomplete_sign_text")
+    let g:easycomplete_sign_text = {
+          \   'error':       "",
+          \   'warning':     "",
+          \   'information': '',
+          \   'hint':        ''
+          \ }
+  endif
   let g:easycomplete_lsp_type_font = {
         \ 'class':     get(kind_icons, "class", ""),     'color':         get(kind_icons, "color", ""),
         \ 'constant':  get(kind_icons, "constant", ""),  'constructor':   get(kind_icons, "constructor", ""),
         \ 'enum':      get(kind_icons, "enum", ""),      'enummember':    get(kind_icons, "enummember", ""),
         \ 'field':     get(kind_icons, "field", ""),     'file':          get(kind_icons, "file", ''),
-        \ 'folder':    get(kind_icons, "folder", ""),    'function':      get(kind_icons, "function", "󰊕"),
+        \ 'folder':    get(kind_icons, "folder", ""),    'function':      get(kind_icons, "function", "󰊕"),
         \ 'interface': get(kind_icons, "interface", ""), 'keyword':       get(kind_icons, "keyword", ""),
         \ 'snippet':   get(kind_icons, "snippet", ""),   'struct':        get(kind_icons, "struct", "󰙅"),
         \ 'text':      get(kind_icons, "text", ""),      'typeparameter': get(kind_icons, "typeparameter", "󰌹"),
@@ -124,9 +133,6 @@ else
   let g:easycomplete_menuflag_cmdline = "cmdline"
 endif
 
-if !exists("g:easycomplete_fuzzymatch_hlgroup")
-  let g:easycomplete_fuzzymatch_hlgroup = ""
-endif
 if !exists("g:easycomplete_tabnine_suggestion")
   let g:easycomplete_tabnine_suggestion = 0
 endif