feat: misc

Author: Saghen

lua/blink/cmp/cmp.lua

@@ -1,6 +1,6 @@
-local M = {}
+local cmp = {}
 
-M.kind_icons = {
+cmp.kind_icons = {
   Text = '󰉿',
   Method = '󰊕',
   Function = '󰊕',
@@ -32,17 +32,17 @@ M.kind_icons = {
   Operator = '󰪚',
   TypeParameter = '󰬛',
 }
-M.filtered_items = {}
+cmp.filtered_items = {}
 
-M.fuzzy = require('blink.fuzzy').fuzzy
-M.lsp = require('blink.cmp.lsp')
+cmp.fuzzy = require('blink.fuzzy').fuzzy
+cmp.lsp = require('blink.cmp.lsp')
 
-M.accept = function(cmp_win)
+cmp.accept = function(cmp_win)
   local bufnr = vim.api.nvim_get_current_buf()
-  local current_line, start_col, end_col = M.get_query_to_replace(bufnr)
+  local current_line, start_col, end_col = cmp.get_query_to_replace(bufnr)
 
   -- Get the item from the filtered items based on the cursorline position
-  local item = M.filtered_items[vim.api.nvim_win_get_cursor(cmp_win.id)[1]]
+  local item = cmp.filtered_items[vim.api.nvim_win_get_cursor(cmp_win.id)[1]]
 
   -- Apply text edit
   vim.api.nvim_buf_set_text(bufnr, current_line, start_col, current_line, end_col, { item.word })
@@ -53,50 +53,53 @@ M.accept = function(cmp_win)
   -- These are used for things like auto-imports
   -- todo: check capabilities to know ahead of time
   if item.additionalTextEdits ~= nil then
-    M.apply_additional_text_edits(item.client_id, item)
+    cmp.apply_additional_text_edits(item.client_id, item)
   else
-    M.lsp.resolve(item, function(client_id, resolved_item) M.apply_additional_text_edits(client_id, resolved_item) end)
+    cmp.lsp.resolve(
+      item,
+      function(client_id, resolved_item) cmp.apply_additional_text_edits(client_id, resolved_item) end
+    )
   end
 end
 
-M.select_next = function(cmp_win, doc_win)
+cmp.select_next = function(cmp_win, doc_win)
   if cmp_win.id == nil then return end
 
   local current_line = vim.api.nvim_win_get_cursor(cmp_win.id)[1]
-  local item_count = #M.filtered_items
+  local item_count = #cmp.filtered_items
   local line_count = vim.api.nvim_buf_line_count(cmp_win.buf)
 
   -- draw a new line if we're at the end and there's more items
   -- todo: this is a hack while waiting for virtual scroll
   if current_line == line_count and item_count > line_count then
-    M.draw_item(cmp_win.buf, line_count + 1, M.filtered_items[line_count + 1])
+    cmp.draw_item(cmp_win.buf, line_count + 1, cmp.filtered_items[line_count + 1])
     vim.api.nvim_win_set_cursor(cmp_win.id, { line_count + 1, 0 })
   -- otherwise just move the cursor, wrapping if at the bottom
   else
     local line = current_line == item_count and 1 or current_line + 1
     vim.api.nvim_win_set_cursor(cmp_win.id, { line, 0 })
   end
 
-  M.update_doc(cmp_win, doc_win)
+  cmp.update_doc(cmp_win, doc_win)
 end
 
 -- todo: how to handle overflow to the bottom? should probably just do proper virtual scroll
-M.select_prev = function(cmp_win, doc_win)
+cmp.select_prev = function(cmp_win, doc_win)
   if cmp_win.id == nil then return end
 
   local current_line = vim.api.nvim_win_get_cursor(cmp_win.id)[1]
   local line_count = vim.api.nvim_buf_line_count(cmp_win.buf)
   local line = current_line - 1 == 0 and line_count or current_line - 1
   vim.api.nvim_win_set_cursor(cmp_win.id, { line, 0 })
 
-  M.update_doc(cmp_win, doc_win)
+  cmp.update_doc(cmp_win, doc_win)
 end
 
-M.update = function(cmp_win, doc_win, items, opts)
-  local query = M.get_query()
+cmp.update = function(cmp_win, doc_win, items, opts)
+  local query = cmp.get_query()
 
   -- get the items based on the user's query
-  local filtered_items = M.filter_items(query, items)
+  local filtered_items = cmp.filter_items(query, items)
 
   -- guards for cases where we shouldn't show the completion window
   local no_items = #filtered_items == 0
@@ -115,7 +118,7 @@ M.update = function(cmp_win, doc_win, items, opts)
   vim.api.nvim_buf_set_option(cmp_win.buf, 'modified', false)
 
   for idx, item in ipairs(filtered_items) do
-    M.draw_item(cmp_win.buf, idx, item)
+    cmp.draw_item(cmp_win.buf, idx, item)
     -- only draw until the window is full
     if idx >= cmp_win.config.max_height then break end
   end
@@ -124,23 +127,23 @@ M.update = function(cmp_win, doc_win, items, opts)
   cmp_win:update()
 
   -- documentation
-  M.update_doc(cmp_win, doc_win)
+  cmp.update_doc(cmp_win, doc_win)
 
-  M.filtered_items = filtered_items
+  cmp.filtered_items = filtered_items
 end
 
-function M.update_doc(cmp_win, doc_win)
+function cmp.update_doc(cmp_win, doc_win)
   -- completion window isn't open
   if cmp_win.id == nil then return end
 
   local current_line = vim.api.nvim_win_get_cursor(cmp_win.id)[1]
-  local item = M.filtered_items[current_line]
+  local item = cmp.filtered_items[current_line]
   if item == nil then
     doc_win:close()
     return
   end
 
-  M.lsp.resolve(item, function(_, resolved_item)
+  cmp.lsp.resolve(item, function(_, resolved_item)
     if resolved_item.detail == nil then
       doc_win:close()
       return
@@ -158,10 +161,10 @@ function M.update_doc(cmp_win, doc_win)
 end
 
 ---------- UTILS ------------
-M.draw_item = function(bufnr, idx, item)
+cmp.draw_item = function(bufnr, idx, item)
   -- get highlight
   local kind_hl = 'CmpItemKind' .. item.kind
-  local kind_icon = M.kind_icons[item.kind] or M.kind_icons.Field
+  local kind_icon = cmp.kind_icons[item.kind] or cmp.kind_icons.Field
   local kind = item.kind
 
   -- get line text
@@ -181,7 +184,7 @@ M.draw_item = function(bufnr, idx, item)
   vim.api.nvim_buf_set_option(bufnr, 'modified', false)
 end
 
-M.filter_items = function(query, items)
+cmp.filter_items = function(query, items)
   if query == '' then return items end
 
   -- convert to table of strings
@@ -192,15 +195,15 @@ M.filter_items = function(query, items)
 
   -- perform fuzzy search
   local filtered_items = {}
-  local selected_indices = M.fuzzy(query, words)
+  local selected_indices = cmp.fuzzy(query, words)
   for _, selected_index in ipairs(selected_indices) do
     table.insert(filtered_items, items[selected_index + 1])
   end
 
   return filtered_items
 end
 
-M.get_query = function()
+cmp.get_query = function()
   local bufnr = vim.api.nvim_get_current_buf()
   local current_line = vim.api.nvim_win_get_cursor(0)[1] - 1
   local current_col = vim.api.nvim_win_get_cursor(0)[2] - 1
@@ -209,7 +212,7 @@ M.get_query = function()
   return query
 end
 
-M.get_query_to_replace = function(bufnr)
+cmp.get_query_to_replace = function(bufnr)
   local current_line = vim.api.nvim_win_get_cursor(0)[1]
   local current_col = vim.api.nvim_win_get_cursor(0)[2]
   local line = vim.api.nvim_buf_get_lines(bufnr, current_line - 1, current_line, false)[1]
@@ -233,11 +236,13 @@ M.get_query_to_replace = function(bufnr)
   return current_line - 1, start_col - 1, end_col
 end
 
-M.apply_additional_text_edits = function(client_id, item) M.apply_text_edits(client_id, item.additionalTextEdits or {}) end
+cmp.apply_additional_text_edits = function(client_id, item)
+  cmp.apply_text_edits(client_id, item.additionalTextEdits or {})
+end
 
-M.apply_text_edits = function(client_id, edits)
+cmp.apply_text_edits = function(client_id, edits)
   local offset_encoding = vim.lsp.get_client_by_id(client_id).offset_encoding
   vim.lsp.util.apply_text_edits(edits, vim.api.nvim_get_current_buf(), offset_encoding)
 end
 
-return M
+return cmp

lua/blink/cmp/init.lua

@@ -1,22 +1,22 @@
-local M = {}
+local m = {}
 
-M.items = {}
+m.items = {}
 
-M.setup = function(config)
-  M.cmp_win = require('blink.cmp.win').new({
+m.setup = function(config)
+  m.cmp_win = require('blink.cmp.win').new({
     cursorline = true,
     winhighlight = 'Normal:Pmenu,FloatBorder:Pmenu,CursorLine:PmenuSel,Search:None',
   })
-  M.doc_win = require('blink.cmp.win').new({
+  m.doc_win = require('blink.cmp.win').new({
     width = 60,
     max_height = 20,
-    relative = M.cmp_win,
+    relative = m.cmp_win,
     wrap = true,
     filetype = 'typescript', -- todo: set dynamically
     padding = true,
   })
-  M.lsp = require('blink.cmp.lsp')
-  M.cmp = require('blink.cmp.cmp')
+  m.lsp = require('blink.cmp.lsp')
+  m.cmp = require('blink.cmp.cmp')
 
   local last_char = ''
   vim.api.nvim_create_autocmd('InsertCharPre', {
@@ -26,26 +26,26 @@ M.setup = function(config)
   -- decide if we should show the completion window
   vim.api.nvim_create_autocmd('TextChangedI', {
     callback = function()
-      if M.cmp_win.id ~= nil then return end
+      if m.cmp_win.id ~= nil then return end
       -- todo: if went from prefix to no prefix, clear the items
-      if last_char ~= '' and last_char ~= ' ' and last_char ~= '\n' then M.update() end
+      if last_char ~= '' and last_char ~= ' ' and last_char ~= '\n' then m.update() end
     end,
   })
 
   -- update the completion window
   vim.api.nvim_create_autocmd('CursorMovedI', {
     callback = function()
-      if M.cmp_win.id ~= nil then M.update() end
+      if m.cmp_win.id ~= nil then m.update() end
     end,
   })
 
   -- show completion windows
   vim.api.nvim_create_autocmd({ 'InsertLeave', 'BufLeave' }, {
     callback = function()
-      M.lsp.cancel_completions()
-      M.cmp_win:close()
-      M.doc_win:close()
-      M.items = {}
+      m.lsp.cancel_completions()
+      m.cmp_win:close()
+      m.doc_win:close()
+      m.items = {}
     end,
   })
 
@@ -57,45 +57,48 @@ M.setup = function(config)
       noremap = true,
       silent = true,
       callback = function()
-        if M.cmp_win.id == nil then return vim.api.nvim_replace_termcodes(key, true, false, true) end
+        if m.cmp_win.id == nil then return vim.api.nvim_replace_termcodes(key, true, false, true) end
         vim.schedule(callback)
       end,
     })
   end
-  keymap('i', '<Tab>', M.accept)
-  keymap('i', '<C-j>', M.select_next)
-  keymap('i', '<C-k>', M.select_prev)
-  keymap('i', '<Up>', M.select_prev)
-  keymap('i', '<Down>', M.select_next)
+  keymap('i', '<Tab>', m.accept)
+  keymap('i', '<C-j>', m.select_next)
+  keymap('i', '<C-k>', m.select_prev)
+  keymap('i', '<Up>', m.select_prev)
+  keymap('i', '<Down>', m.select_next)
   vim.api.nvim_set_keymap('i', '<C-space>', '', {
     noremap = true,
     silent = true,
-    callback = function() M.update({ force = true }) end,
+    callback = function() m.update({ force = true }) end,
   })
 end
 
-M.update = function(opts)
+m.update = function(opts)
   opts = opts or { force = false }
 
+  m.cmp_win:temp_buf_hack()
+  m.doc_win:temp_buf_hack()
+
   -- immediately update the results
-  M.cmp.update(M.cmp_win, M.doc_win, M.items, opts)
-  M.cmp_win:update()
-  M.doc_win:update()
+  m.cmp.update(m.cmp_win, m.doc_win, m.items, opts)
+  m.cmp_win:update()
+  m.doc_win:update()
   -- trigger the lsp and update the results after retrieving
-  M.lsp.completions(function(items)
-    M.items = items
-    M.cmp.update(M.cmp_win, M.doc_win, M.items, opts)
-    M.cmp_win:update()
-    M.doc_win:update()
+  m.lsp.completions(function(items)
+    m.items = items
+    m.cmp.update(m.cmp_win, m.doc_win, m.items, opts)
+    m.cmp_win:update()
+    m.doc_win:update()
   end)
 end
 
-M.accept = function()
-  if M.cmp_win.id ~= nil then M.cmp.accept(M.cmp_win) end
+m.accept = function()
+  if m.cmp_win.id ~= nil then m.cmp.accept(m.cmp_win) end
 end
 
-M.select_prev = function() M.cmp.select_prev(M.cmp_win, M.doc_win) end
+m.select_prev = function() m.cmp.select_prev(m.cmp_win, m.doc_win) end
 
-M.select_next = function() M.cmp.select_next(M.cmp_win, M.doc_win) end
+m.select_next = function() m.cmp.select_next(m.cmp_win, m.doc_win) end
 
-return M
+return m