Normalize config

README.md

@@ -45,20 +45,18 @@ require("autocomplete.lsp").setup {
 
 -- cmdline autocompletion
 require("autocomplete.cmd").setup {
-    window = {
-        border = nil,
-        columns = 5,
-        rows = 0.3
-    },
     mappings = {
         accept = '<C-y>',
         reject = '<C-e>',
         complete = '<C-space>',
         next = '<C-n>',
         previous = '<C-p>',
     },
-    debounce_delay = 100,
+    border = nil, -- Cmdline completion border style
+    columns = 5, -- Number of columns per row
+    rows = 0.3, -- Number of rows, if < 1 then its fraction of total vim lines, if > 1 then its absolute number
     close_on_done = true, -- Close completion window when done (accept/reject)
+    debounce_delay = 100,
 }
 ```
 
@@ -84,7 +82,7 @@ when resolving completion items:
 -- Here we grab default Neovim capabilities and extend them with ones we want on top
 local capabilities = vim.tbl_deep_extend('force', 
     vim.lsp.protocol.make_client_capabilities(), 
-    require('completion.lsp').capabilities())
+    require('completion.lsp').capabilities)
 
 -- Now set capabilities on your LSP servers
 require('lspconfig')['<YOUR_LSP_SERVER>'].setup {

lua/autocomplete/cmd.lua

@@ -29,7 +29,7 @@ local function open_win(height)
     if not state.window.id or not vim.api.nvim_win_is_valid(state.window.id) then
         state.window.id = vim.api.nvim_open_win(state.window.bufnr, false, {
             relative = 'editor',
-            border = M.config.window.border,
+            border = M.config.border,
             style = 'minimal',
             width = vim.o.columns,
             height = height,
@@ -115,12 +115,12 @@ local function cmdline_changed()
         return
     end
 
-    local window_height = M.config.window.rows
+    local window_height = M.config.rows
     if window_height < 1 then
         window_height = math.floor(vim.o.lines * window_height)
     end
 
-    local col_width = math.floor(vim.o.columns / M.config.window.columns)
+    local col_width = math.floor(vim.o.columns / M.config.columns)
 
     -- Recreate window if we closed it before
     open_win(window_height)
@@ -242,20 +242,18 @@ local function leave_handler()
 end
 
 M.config = {
-    window = {
-        border = nil,
-        columns = 5,
-        rows = 0.3,
-    },
     mappings = {
         accept = '<C-y>',
         reject = '<C-e>',
         complete = '<C-space>',
         next = '<C-n>',
         previous = '<C-p>',
     },
-    debounce_delay = 100,
+    border = nil, -- Cmdline completion border style
+    columns = 5, -- Number of columns per row
+    rows = 0.3, -- Number of rows, if < 1 then its fraction of total vim lines, if > 1 then its absolute number
     close_on_done = true, -- Close completion window when done (accept/reject)
+    debounce_delay = 100,
 }
 
 function M.setup(config)

lua/autocomplete/lsp.lua

@@ -144,24 +144,22 @@ M.config = {
     debounce_delay = 100,
 }
 
-function M.capabilities()
-    return {
-        textDocument = {
-            completion = {
-                completionItem = {
-                    -- Fetch additional info for completion items
-                    resolveSupport = {
-                        properties = {
-                            'documentation',
-                            'detail',
-                            'additionalTextEdits',
-                        },
+M.capabilities = {
+    textDocument = {
+        completion = {
+            completionItem = {
+                -- Fetch additional info for completion items
+                resolveSupport = {
+                    properties = {
+                        'documentation',
+                        'detail',
+                        'additionalTextEdits',
                     },
                 },
             },
         },
-    }
-end
+    },
+}
 
 function M.setup(config)
     M.config = vim.tbl_deep_extend('force', M.config, config or {})