feat: better api for custom complete source

fix: lua check

fix: some api changes

Author: haorenW1025

lua/completion.lua

@@ -1,5 +1,6 @@
 local vim = vim
 local api = vim.api
+local match = require'completion.matching'
 local source = require 'source'
 local signature = require'completion.signature_help'
 local hover = require'completion.hover'
@@ -182,6 +183,14 @@ M.customize_buf_label = function(label)
   api.nvim_buf_set_var(0, "completion_buf_customize_lsp_label", label)
 end
 
+M.insertCompletionItems = function(complete_items, prefix, item)
+  match.matching(complete_items, prefix, item)
+end
+
+M.addCompletionSource = function(key, complete_item)
+  source.addCompleteItems(key, complete_item)
+end
+
 M.on_attach = function(opt)
   api.nvim_command [[augroup CompletionCommand]]
     api.nvim_command("autocmd! * <buffer>")

lua/completion/matching.lua

@@ -1,55 +1,13 @@
 local vim = vim
+local util = require'completion.util'
 local M = {}
 
--- Levenshtein algorithm for fuzzy matching
--- https://gist.github.com/james2doyle/e406180e143da3bdd102
-local function fuzzy_score(str1, str2)
-  local len1 = #str1
-  local len2 = #str2
-  local matrix = {}
-  local cost
-  local min = math.min;
-
-  -- quick cut-offs to save time
-  if (len1 == 0) then
-    return len2
-  elseif (len2 == 0) then
-    return len1
-  elseif (str1 == str2) then
-    return 0
-  end
-
-  -- initialise the base matrix values
-  for i = 0, len1, 1 do
-    matrix[i] = {}
-    matrix[i][0] = i
-  end
-  for j = 0, len2, 1 do
-    matrix[0][j] = j
-  end
-
-  -- actual Levenshtein algorithm
-  for i = 1, len1, 1 do
-    for j = 1, len2, 1 do
-      if (str1:byte(i) == str2:byte(j)) then
-        cost = 0
-      else
-        cost=1
-      end
-      matrix[i][j] = min(matrix[i-1][j] + 2, matrix[i][j-1], matrix[i-1][j-1] + cost)
-    end
-  end
-
-  -- return the last value - this is the Levenshtein distance
-  return matrix[len1][len2]
-end
-
 local function fuzzy_match(prefix, word)
   if vim.g.completion_matching_ignore_case == 1 then
     prefix = string.lower(prefix)
     word = string.lower(word)
   end
-  local score = fuzzy_score(prefix, word)
+  local score = util.fuzzy_score(prefix, word)
   if score < 1 then
     return true, score
   else
@@ -82,10 +40,24 @@ local function exact_match(prefix, word)
   end
 end
 
-M.matching_strategy = {
+local matching_strategy = {
   fuzzy = fuzzy_match,
-  substr = substring_match,
+  substring = substring_match,
   exact = exact_match
 }
 
+M.matching = function(complete_items, prefix, item)
+  local matcher_list = vim.b.completion_matching_strategy_list or vim.g.completion_matching_strategy_list
+  local matching_piroity = 1
+  for _, method in ipairs(matcher_list) do
+    local is_match, score = matching_strategy[method](prefix, item.word)
+    if is_match then
+      item.user_data.matching_piroity = matching_piroity
+      item.score = score
+      util.addCompletionItems(complete_items, item)
+      break
+    end
+  end
+end
+
 return M

lua/completion/util.lua

@@ -30,16 +30,19 @@ function M.sort_completion_items(items)
 end
 
 function M.addCompletionItems(item_table, item)
+  -- word cannot be nil
+  if item.word == nil then return end
   table.insert(item_table, {
       word = item.word,
-      abbr = item.abbr,
-      kind = item.kind,
-      menu = item.menu,
-      info = item.info,
+      abbr = item.abbr or '',
+      kind = item.kind or '',
+      menu = item.menu or '',
+      info = item.info or '',
+      priority = item.priority or 1,
       icase = 1,
       dup = 1,
       empty = 1,
-      user_data = item.user_data,
+      user_data = item.user_data or {},
     })
 end
 

lua/source/lsp.lua

@@ -58,22 +58,12 @@ local function text_document_completion_list_to_complete_items(result, prefix)
         }
       }
       local kind = protocol.CompletionItemKind[completion_item.kind]
-      item.kind = customize_label[kind] or kind or ''
+      item.kind = customize_label[kind] or kind
       item.abbr = completion_item.label
-      item.priority = vim.g.completion_items_priority[item.kind] or 1
+      item.priority = vim.g.completion_items_priority[item.kind]
       item.menu = completion_item.detail or ''
-      local matching_piroity = 1
 
-      local matcher_list = vim.b.completion_matching_strategy_list or vim.g.completion_matching_strategy_list
-      for _, method in ipairs(matcher_list) do
-        local is_match, score = match.matching_strategy[method](prefix, item.word)
-        item.score = score
-        if is_match then
-          item.user_data.matching_piroity = matching_piroity
-          util.addCompletionItems(matches, item)
-          break
-        end
-      end
+      match.matching(matches, prefix, item)
     end
   end
 

lua/source/snippet.lua

@@ -1,9 +1,10 @@
 local vim = vim
 local api = vim.api
+local match = require'completion.matching'
 local M = {}
 
 
-local getUltisnipItems = function(prefix, score_func)
+local getUltisnipItems = function(prefix)
   if vim.fn.exists("*UltiSnips#SnippetsInCurrentScope") == 0 then return {} end
   local snippetsList = api.nvim_call_function('UltiSnips#SnippetsInCurrentScope', {})
   local complete_items = {}
@@ -16,51 +17,37 @@ local getUltisnipItems = function(prefix, score_func)
     if key == true then
       key = 'true'
     end
-    local score = score_func(prefix, key)
+    local item = {}
+    item.word = key
+    item.kind = 'UltiSnips'
+    item.priority = priority
     local user_data = {hover = val}
-    if score < #prefix/2 then
-      table.insert(complete_items, {
-        word = key,
-        kind = 'UltiSnips',
-        score = score,
-        priority = priority,
-        icase = 1,
-        dup = 1,
-        empty = 1,
-        user_data = vim.fn.json_encode(user_data)
-      })
-    end
+    item.user_data = user_data
+    match.matching(complete_items, prefix, item)
   end
   return complete_items
 end
 
-local getNeosnippetItems = function(prefix, score_func)
+local getNeosnippetItems = function(prefix)
   if vim.fn.exists("*neosnippet#helpers#get_completion_snippets") == 0 then return {} end
   local snippetsList = api.nvim_call_function('neosnippet#helpers#get_completion_snippets', {})
   local complete_items = {}
   if vim.tbl_isempty(snippetsList) == 0 then
     return {}
   end
-  local priority = vim.g.completion_items_priority['Neosnippet'] or 1
+  local priority = vim.g.completion_items_priority['Neosnippet']
   for key, val in pairs(snippetsList) do
     if key == true then
       key = 'true'
     end
     local user_data = {hover = val.description}
-    local score = score_func(prefix, key)
-      if score < #prefix/2 then
-        table.insert(complete_items, {
-          word = key,
-          kind = 'Neosnippet',
-          score = score,
-          priority = priority,
-          icase = 1,
-          dup = 1,
-          empty = 1,
-          user_data = vim.fn.json_encode(user_data)
-        })
-      end
-    end
+    local item = {}
+    item.word = key
+    item.kind = 'Neosnippet'
+    item.priority = priority
+    item.user_data = user_data
+    match.matching(complete_items, prefix, item)
+  end
   return complete_items
 end