bugfix for #269

jayli · Dec 9, 2023 · afc5f2d · afc5f2d
1 parent e167ced
commit afc5f2d
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 3 deletions.
diff --git a/autoload/easycomplete/tabnine.vim b/autoload/easycomplete/tabnine.vim
@@ -1,7 +1,7 @@
 " ./sources/tn.vim 负责pum匹配，这里只负责做代码联想提示
 " tabnine suggestion 和 tabnine complete 共享一个 job
 
-let s:tabnine_toolkit = v:lua.require("easycomplete.tabnine")
+let s:tabnine_toolkit = easycomplete#util#HasLua() ? v:lua.require("easycomplete.tabnine") : v:null
 " 临时存放 suggest 或者 complete
 let b:tabnine_typing_type = ""
 let s:tabnine_hint_snippet = []
@@ -10,6 +10,9 @@ function easycomplete#tabnine#ready()
   if g:env_is_vim
     return v:false
   endif
+  if !easycomplete#util#HasLua()
+    return v:false
+  endif
   if !easycomplete#ok('g:easycomplete_tabnine_enable')
     return v:false
   endif

diff --git a/autoload/easycomplete/ui.vim b/autoload/easycomplete/ui.vim
@@ -87,10 +87,14 @@ function! easycomplete#ui#GetHiColor(hiName, sufix)
     let my_color= matchstr(hlString,"\\(\\scterm" .sufix. "=\\)\\@<=\\w\\+")
   endif
 
-  if my_color =~ '^\d\+$'
-      return str2nr(my_color)
+  if my_color == ""
+    return "NONE"
   endif
 
+  " if my_color =~ '^\d\+$'
+  "   return str2nr(my_color)
+  " endif
+
   return my_color
 endfunction " }}}
 

diff --git a/autoload/easycomplete/util.vim b/autoload/easycomplete/util.vim
@@ -1684,6 +1684,14 @@ function! easycomplete#util#FindNearestParentFile(path, filename) abort
   endif
 endfunction
 
+function! easycomplete#util#HasLua()
+  if g:env_is_nvim && has("nvim-0.5.0")
+    return v:true
+  else
+    return v:false
+  endif
+endfunction
+
 function! easycomplete#util#GetDefaultRootUri()
   let current_lsp_ctx = easycomplete#GetCurrentLspContext()
   let current_file_path = fnamemodify(expand('%'), ':p:h')

diff --git a/lua/easycomplete/tabnine.lua b/lua/easycomplete/tabnine.lua
@@ -7,6 +7,16 @@ function Export.nvim_init_tabnine_hl()
   local cursorline_bg = vim.fn["easycomplete#ui#GetBgColor"]("CursorLine")
   local normal_bg = vim.fn["easycomplete#ui#GetBgColor"]("Normal")
   local linenr_fg = vim.fn["easycomplete#ui#GetFgColor"]("LineNr")
+  if vim.fn.matchstr(cursorline_bg, "^\\d\\+") ~= "" then
+    cursorline_bg = vim.fn.str2nr(cursorline_bg)
+  end
+  if vim.fn.matchstr(normal_bg, "^\\d\\+") ~= "" then
+    normal_bg = vim.fn.str2nr(normal_bg)
+  end
+  if vim.fn.matchstr(linenr_fg, "^\\d\\+") ~= "" then
+    linenr_fg = vim.fn.str2nr(linenr_fg)
+  end
+
   vim.api.nvim_set_hl(0, "TabNineSuggestionFirstLine", {
     bg = cursorline_bg,
     fg = linenr_fg