cleanup a bit

Signed-off-by: Tomas Slusny <[email protected]>

Author: deathbeam

lua/autocomplete/buffer.lua

@@ -37,20 +37,14 @@ local function complete_treesitter(bufnr, prefix, cmp_start)
     local defs = locals.get_definitions_lookup_table(bufnr)
     local ft = vim.bo[bufnr].filetype
     local items = {}
+    local kind_map = vim.tbl_map(string.lower, vim.tbl_keys(vim.lsp.protocol.CompletionItemKind))
 
     for id, entry in pairs(defs) do
-        -- FIXME: This is not pretty, the format of the ID is not documented and might change, but its fastest way
         local name = id:match('k_(.+)_%d+_%d+_%d+_%d+$')
         local node = entry.node
         local kind = entry.kind
         if node and kind then
-            for _, k in ipairs(vim.lsp.protocol.CompletionItemKind) do
-                if string.find(k:lower(), kind:lower()) then
-                    kind = k
-                    break
-                end
-            end
-
+            kind = kind_map[kind:lower()] or kind
             local start_line_node, _, _ = node:start()
             local end_line_node, _, _ = node:end_()
 

lua/autocomplete/cmd.lua

@@ -17,12 +17,12 @@ function M.setup()
         callback = function()
             local cmdline = vim.fn.getcmdline()
             local curpos = vim.fn.getcmdpos()
-            local last_char = cmdline:sub(-1)
+            local last_char = cmdline:sub(curpos - 1, curpos - 1)
 
             if
                 curpos == #cmdline + 1
                 and vim.fn.pumvisible() == 0
-                and last_char:match('[%w%/%: ]')
+                and last_char:match('[%w%/%:- ]')
                 and not cmdline:match('^%d+$')
             then
                 vim.api.nvim_feedkeys(term, 'ti', false)