feat: support lua per server setup

add todo

fix some stuff

fix

fix

Author: haorenW1025

lua/completion.lua

@@ -4,6 +4,7 @@ local match = require'completion.matching'
 local source = require 'completion.source'
 local signature = require'completion.signature_help'
 local hover = require'completion.hover'
+local opt = require'completion.option'
 local M = {}
 
 ------------------------------------------------------------------------
@@ -12,7 +13,6 @@ local M = {}
 
 M.completionConfirm = false
 
-
 -- Manager variable to keep all state accross completion
 local manager = {
   -- Handle insertCharPre event, turn off imediately when preforming completion
@@ -75,7 +75,7 @@ function M.confirmCompletion()
       end
     end
 
-    if vim.g.completion_enable_auto_paren == 1 then
+    if opt.get_option('enable_auto_paren') == 1 then
       M.autoAddParens(complete_item)
     end
     if complete_item.kind == 'UltiSnips' then
@@ -97,7 +97,7 @@ function M.on_InsertCharPre()
   manager.insertChar = true
   manager.textHover = true
   manager.selected = -1
-  if vim.g.completion_auto_change_source == 1 then
+  if opt.get_option('auto_change_source') == 1 then
     manager.autoChange = true
   end
 end
@@ -117,28 +117,28 @@ function M.on_InsertEnter()
   manager.insertLeave = false
   manager.insertChar = false
   manager.changeSource = false
-  if vim.g.completion_auto_change_source == 1 then
+  if opt.get_option('auto_change_source') == 1 then
     manager.autoChange = true
   end
 
   -- reset source
   source.chain_complete_index = 1
   source.stop_complete = false
   local l_complete_index = source.chain_complete_index
-  local timer_cycle = vim.g.completion_timer_cycle
+  local timer_cycle = opt.get_option('timer_cycle')
 
   timer:start(100, timer_cycle, vim.schedule_wrap(function()
     local l_changedTick = api.nvim_buf_get_changedtick(0)
     -- complete if changes are made
     if l_changedTick ~= manager.changedTick then
       manager.changedTick = l_changedTick
-      if vim.g.completion_enable_auto_popup == 1 then
+      if opt.get_option('enable_auto_popup') == 1 then
         source.autoCompletion(manager)
       end
-      if vim.g.completion_enable_auto_hover == 1 then
+      if opt.get_option('enable_auto_hover') == 1 then
         hover.autoOpenHoverInPopup(manager)
       end
-      if vim.g.completion_enable_auto_signature == 1 then
+      if opt.get_option('enable_auto_signature') == 1 then
         signature.autoOpenSignatureHelp()
       end
     end
@@ -207,16 +207,24 @@ M.prevSource = function()
   source.prevCompletion()
 end
 
-M.on_attach = function(opt)
+M.on_attach = function(option)
+  -- setup completion_option tables
+  if option ~= nil then
+    opt.set_option_table(option)
+  else
+    opt.set_option_table(option)
+  end
+  -- setup autocommand
+  -- TODO: Modified this if lua callbacks for autocmd is merged
   api.nvim_command("augroup CompletionCommand")
     api.nvim_command("autocmd! * <buffer>")
     api.nvim_command("autocmd InsertEnter <buffer> lua require'completion'.on_InsertEnter()")
     api.nvim_command("autocmd InsertLeave <buffer> lua require'completion'.on_InsertLeave()")
     api.nvim_command("autocmd InsertCharPre <buffer> lua require'completion'.on_InsertCharPre()")
     api.nvim_command("autocmd CompleteDone <buffer> lua require'completion'.confirmCompletion()")
   api.nvim_command("augroup end")
-  if string.len(vim.g.completion_confirm_key) ~= 0 then
-    api.nvim_buf_set_keymap(0, 'i', vim.g.completion_confirm_key,
+  if string.len(opt.get_option('confirm_key')) ~= 0 then
+    api.nvim_buf_set_keymap(0, 'i', opt.get_option('confirm_key'),
       'pumvisible() ? complete_info()["selected"] != "-1" ? "\\<Plug>(completion_confirm_completion)" :'..
       ' "\\<c-e>\\<CR>" : "\\<CR>"',
       {silent=false, noremap=false, expr=true})
@@ -228,17 +236,6 @@ M.on_attach = function(opt)
     api.nvim_command("augroup end")
   end
   api.nvim_buf_set_var(0, 'completion_enable', 1)
-  if opt == nil then return end
-  local sorter = opt.sorter
-  local matcher = opt.matcher
-  if sorter ~= nil then
-    vim.validate{sorter={sorter, 'string'}}
-    vim.b.completion_sorting = sorter
-  end
-  if matcher ~= nil then
-    vim.validate{matcher={matcher, 'table'}}
-    vim.b.completion_matching_strategy_list = matcher
-  end
 end
 
 return M

lua/completion/chain_completion.lua

@@ -1,6 +1,7 @@
 local vim = vim
 local api = vim.api
 local util = require 'completion.util'
+local opt = require 'completion.option'
 local M ={}
 
 --------------------------------------------------------------
@@ -68,7 +69,7 @@ end
 -- preserve compatiblity of completion_chain_complete_list
 function M.getChainCompleteList(filetype)
 
-  local chain_complete_list = chain_list_to_tree(vim.g.completion_chain_complete_list)
+  local chain_complete_list = chain_list_to_tree(opt.get_option('chain_complete_list'))
   -- check if chain_complete_list is a array
 
   if chain_complete_list[filetype] then

lua/completion/complete.lua

@@ -4,6 +4,7 @@ local util = require 'completion.util'
 local ins = require 'completion.source.ins_complete'
 local match = require'completion.matching'
 local lsp = require'completion.source.lsp'
+local opt = require 'completion.option'
 
 local M = {}
 
@@ -33,7 +34,7 @@ M.clearCache = function()
 end
 
 -- perform completion
-M.performComplete = function(complete_source, complete_items_map, manager, opt)
+M.performComplete = function(complete_source, complete_items_map, manager, params)
 
   manager.insertChar = false
   if vim.fn.has_key(complete_source, "mode") > 0 then
@@ -56,7 +57,7 @@ M.performComplete = function(complete_source, complete_items_map, manager, opt)
           table.insert(callback_array, true)
         else
           table.insert(callback_array, complete_items.callback)
-          complete_items.trigger(manager, opt)
+          complete_items.trigger(manager, params)
         end
         table.insert(items_array, complete_items.item)
       end
@@ -73,14 +74,14 @@ M.performComplete = function(complete_source, complete_items_map, manager, opt)
         -- only perform complete when callback_array are all true
         if checkCallback(callback_array) == true and timer:is_closing() == false then
           if api.nvim_get_mode()['mode'] == 'i' or api.nvim_get_mode()['mode'] == 'ic' then
-            local items = getCompletionItems(items_array, opt.prefix)
-            if vim.g.completion_sorting ~= "none" then
+            local items = getCompletionItems(items_array, params.prefix)
+            if opt.get_option('sorting') ~= "none" then
               util.sort_completion_items(items)
             end
             if #items ~= 0 then
               -- reset insertChar and handle auto changing source
               cache_complete_items = items
-              vim.fn.complete(opt.textMatch+1, items)
+              vim.fn.complete(params.textMatch+1, items)
               manager.changeSource = false
             else
               manager.changeSource = true
@@ -94,15 +95,15 @@ M.performComplete = function(complete_source, complete_items_map, manager, opt)
       if api.nvim_get_mode()['mode'] == 'i' or api.nvim_get_mode()['mode'] == 'ic' then
         local items = {}
         for _, item in ipairs(cache_complete_items) do
-          match.matching(items, opt.prefix, item)
+          match.matching(items, params.prefix, item)
         end
-        if vim.g.completion_sorting ~= "none" then
+        if opt.get_option('sorting') ~= "none" then
           util.sort_completion_items(items)
         end
         if #items ~= 0 then
           -- reset insertChar and handle auto changing source
           cache_complete_items = items
-          vim.fn.complete(opt.textMatch+1, items)
+          vim.fn.complete(params.textMatch+1, items)
           manager.changeSource = false
         else
           cache_complete_items = {}

lua/completion/health.lua

@@ -1,6 +1,7 @@
 local vim = vim
 local api = vim.api
 local source = require 'completion.source'
+local opt = require 'completion.option'
 
 local health_start = vim.fn["health#report_start"]
 local health_ok = vim.fn['health#report_ok']
@@ -14,7 +15,7 @@ local checkCompletionSource = function()
 end
 
 local checkSnippetSource = function()
-  local snippet_source = vim.g.completion_enable_snippet
+  local snippet_source = opt.get_option('enable_snippet')
   if snippet_source == nil then
     health_info("You haven't setup any snippet source.")
   elseif snippet_source == 'UltiSnips' then

lua/completion/hover.lua

@@ -2,6 +2,7 @@
 local vim = vim
 local validate = vim.validate
 local api = vim.api
+local opt = require 'completion.option'
 
 local M = {}
 
@@ -190,11 +191,11 @@ local fancy_floating_markdown = function(contents, opts)
   local height = #stripped
   local bufnr = api.nvim_create_buf(false, true)
   local winnr
-  if vim.g.completion_docked_hover == 1 then
-    if height > vim.g.completion_docked_maximum_size then
-      height = vim.g.completion_docked_maximum_size
-    elseif height < vim.g.completion_docked_minimum_size then
-      height = vim.g.completion_docked_minimum_size
+  if opt.get_option('docked_hover') == 1 then
+    if height > opt.get_option('docked_maximum_size') then
+      height = opt.get_option('docked_maximum_size')
+    elseif height < opt.get_option('docked_minimum_size') then
+      height = opt.get_option('docked_minimum_size')
     end
     local row
     if vim.fn.winline() > api.nvim_get_option('lines')/2 then

lua/completion/matching.lua

@@ -1,9 +1,10 @@
 local vim = vim
-local util = require'completion.util'
+local util = require 'completion.util'
+local opt = require 'completion.option'
 local M = {}
 
 local function fuzzy_match(prefix, word)
-  if vim.g.completion_matching_ignore_case == 1 then
+  if opt.get_option('matching_ignore_case') == 1 then
     prefix = string.lower(prefix)
     word = string.lower(word)
   end
@@ -17,7 +18,7 @@ end
 
 
 local function substring_match(prefix, word)
-  if vim.g.completion_matching_ignore_case == 1 then
+  if opt.get_option('matching_ignore_case') == 1 then
     prefix = string.lower(prefix)
     word = string.lower(word)
   end
@@ -29,7 +30,7 @@ local function substring_match(prefix, word)
 end
 
 local function exact_match(prefix, word)
-  if vim.g.completion_matching_ignore_case == 1 then
+  if opt.get_option('matching_ignore_case') == 1 then
     prefix = string.lower(prefix)
     word = string.lower(word)
   end
@@ -47,7 +48,7 @@ local matching_strategy = {
 }
 
 M.matching = function(complete_items, prefix, item)
-  local matcher_list = vim.b.completion_matching_strategy_list or vim.g.completion_matching_strategy_list
+  local matcher_list = opt.get_option('matching_strategy_list')
   local matching_priority = 2
   for _, method in ipairs(matcher_list) do
     local is_match, score = matching_strategy[method](prefix, item.word)

lua/completion/option.lua

@@ -0,0 +1,26 @@
+local M = {}
+
+
+-- fallback to using global variable as default
+local completion_opt_metatable = {
+  __index = function(_, key)
+    key = 'completion_'..key
+    return vim.g[key]
+  end
+}
+
+local option_table = setmetatable({}, completion_opt_metatable)
+
+M.set_option_table = function(opt)
+  if opt ~= nil then
+    option_table = setmetatable(opt, completion_opt_metatable)
+  else
+    option_table = setmetatable({}, completion_opt_metatable)
+  end
+end
+
+M.get_option = function(opt)
+  return option_table[opt]
+end
+
+return M

lua/completion/source.lua

@@ -6,6 +6,7 @@ local chain_completion = require 'completion.chain_completion'
 local lsp = require 'completion.source.lsp'
 local snippet = require 'completion.source.snippet'
 local path = require 'completion.source.path'
+local opt = require 'completion.option'
 
 local M = {}
 
@@ -74,7 +75,7 @@ local triggerCurrentCompletion = function(manager, bufnr, line_to_cursor, prefix
   local source_trigger_character = getTriggerCharacter(complete_source)
   local triggered
   triggered = util.checkTriggerCharacter(line_to_cursor, source_trigger_character) or
-              util.checkTriggerCharacter(line_to_cursor, vim.g.completion_trigger_character)
+              util.checkTriggerCharacter(line_to_cursor, opt.get_option('trigger_character'))
 
   if complete_source.complete_items ~= nil then
     for _, source in ipairs(complete_source.complete_items) do
@@ -102,7 +103,7 @@ local triggerCurrentCompletion = function(manager, bufnr, line_to_cursor, prefix
     end
   end
 
-  local length = vim.g.completion_trigger_keyword_length
+  local length = opt.get_option('trigger_keyword_length')
   if #prefix < length and not triggered and not force then
     return
   end
@@ -150,15 +151,15 @@ function M.autoCompletion(manager)
   local prefix = line_to_cursor:sub(textMatch+1)
   local rev_textMatch = #cursor_to_end - vim.fn.match(cursor_to_end:reverse(), '\\k*$')
   local suffix = cursor_to_end:sub(1, rev_textMatch)
-  local length = vim.g.completion_trigger_keyword_length
+  local length = opt.get_option('trigger_keyword_length')
 
   -- reset completion when deleting character in insert mode
   if #prefix < M.prefixLength and vim.fn.pumvisible() == 0 then
     M.chain_complete_index = 1
     -- not sure if I should clear cache here
     complete.clearCache()
     -- api.nvim_input("<c-g><c-g>")
-    if vim.g.completion_trigger_on_delete == 1 then
+    if opt.get_option('trigger_on_delete') == 1 then
       M.triggerCompletion(false, manager)
     end
     M.stop_complete = false