refactor!: use newer APIs for setting keymaps and autocmds

BREAKING CHANGE: This drops support for Neovim versions earlier than 0.7. For earlier versions of Neovim, use the nvim-0.5 branch.
stevearc · Jul 28, 2022 · 47b95c1 · 47b95c1
1 parent 5915d56
commit 47b95c1
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 54 deletions.
diff --git a/lua/dressing/input.lua b/lua/dressing/input.lua
@@ -155,9 +155,9 @@ _G.dressing_input_complete = M.completefunc
 
 M.trigger_completion = function()
   if vim.fn.pumvisible() == 1 then
-    return vim.api.nvim_replace_termcodes("<C-n>", true, false, true)
+    return "<C-n>"
   else
-    return vim.api.nvim_replace_termcodes("<C-x><C-u>", true, false, true)
+    return "<C-x><C-u>"
   end
 end
 
@@ -266,31 +266,16 @@ setmetatable(M, {
     -- Finish setting up the buffer
     vim.api.nvim_buf_set_option(bufnr, "swapfile", false)
     vim.api.nvim_buf_set_option(bufnr, "bufhidden", "wipe")
-    local keyopts = { silent = true, noremap = true }
-    local close_rhs = "<cmd>lua require('dressing.input').close()<CR>"
-    vim.api.nvim_buf_set_keymap(bufnr, "n", "<Esc>", close_rhs, keyopts)
+    vim.keymap.set("n", "<Esc>", M.close, { buffer = bufnr })
     if config.insert_only then
-      vim.api.nvim_buf_set_keymap(bufnr, "i", "<Esc>", close_rhs, keyopts)
+      vim.keymap.set("i", "<Esc>", M.close, { buffer = bufnr })
     end
 
-    local confirm_rhs = "<cmd>lua require('dressing.input').confirm()<CR>"
-    vim.api.nvim_buf_set_keymap(bufnr, "i", "<C-c>", close_rhs, keyopts)
-    vim.api.nvim_buf_set_keymap(bufnr, "i", "<CR>", confirm_rhs, keyopts)
-    vim.api.nvim_buf_set_keymap(bufnr, "n", "<CR>", confirm_rhs, keyopts)
-    vim.api.nvim_buf_set_keymap(
-      bufnr,
-      "i",
-      "<Up>",
-      "<cmd>lua require('dressing.input').history_prev()<CR>",
-      keyopts
-    )
-    vim.api.nvim_buf_set_keymap(
-      bufnr,
-      "i",
-      "<Down>",
-      "<cmd>lua require('dressing.input').history_next()<CR>",
-      keyopts
-    )
+    vim.keymap.set("i", "<C-c>", M.close, { buffer = bufnr })
+    vim.keymap.set("i", "<CR>", M.confirm, { buffer = bufnr })
+    vim.keymap.set("n", "<CR>", M.confirm, { buffer = bufnr })
+    vim.keymap.set("i", "<Up>", M.history_prev, { buffer = bufnr })
+    vim.keymap.set("i", "<Down>", M.history_next, { buffer = bufnr })
     vim.api.nvim_buf_set_option(bufnr, "filetype", "DressingInput")
     vim.api.nvim_buf_set_lines(bufnr, 0, -1, true, { opts.default or "" })
     -- Disable nvim-cmp if installed
@@ -306,32 +291,25 @@ setmetatable(M, {
       { align = config.prompt_align }
     )
 
-    vim.cmd([[
-      aug DressingHighlight
-        autocmd! * <buffer>
-        autocmd TextChanged <buffer> lua require('dressing.input').highlight()
-        autocmd TextChangedI <buffer> lua require('dressing.input').highlight()
-      aug END
-    ]])
+    vim.api.nvim_create_autocmd({ "TextChanged", "TextChangedI" }, {
+      desc = "Update highlights",
+      buffer = bufnr,
+      callback = M.highlight,
+    })
 
     if opts.completion then
       vim.api.nvim_buf_set_option(bufnr, "completefunc", "v:lua.dressing_input_complete")
       vim.api.nvim_buf_set_option(bufnr, "omnifunc", "")
-      vim.api.nvim_buf_set_keymap(
-        bufnr,
-        "i",
-        "<Tab>",
-        [[luaeval("require('dressing.input').trigger_completion()")]],
-        { expr = true }
-      )
+      vim.keymap.set("i", "<Tab>", M.trigger_completion, { buffer = bufnr, expr = true })
     end
 
-    vim.cmd([[
-      aug DressingCloseWin
-        autocmd! * <buffer>
-        autocmd BufLeave <buffer> ++nested ++once lua require('dressing.input').close()
-      aug END
-    ]])
+    vim.api.nvim_create_autocmd("BufLeave", {
+      desc = "Cancel vim.ui.input",
+      buffer = bufnr,
+      nested = true,
+      once = true,
+      callback = M.close,
+    })
 
     if config.start_in_insert then
       vim.cmd("startinsert!")

diff --git a/lua/dressing/select/builtin.lua b/lua/dressing/select/builtin.lua
@@ -57,16 +57,16 @@ M.select = function(config, items, opts, on_choice)
   vim.api.nvim_buf_set_option(bufnr, "filetype", "DressingSelect")
   util.add_title_to_win(winnr, opts.prompt)
 
-  local function map(lhs, rhs)
-    vim.api.nvim_buf_set_keymap(bufnr, "n", lhs, rhs, { silent = true, noremap = true })
-  end
-
-  map("<CR>", [[<cmd>lua require('dressing.select.builtin').choose()<CR>]])
-  map("<C-c>", [[<cmd>lua require('dressing.select.builtin').cancel()<CR>]])
-  map("<Esc>", [[<cmd>lua require('dressing.select.builtin').cancel()<CR>]])
-  vim.cmd([[
-    autocmd BufLeave <buffer> ++nested ++once lua require('dressing.select.builtin').cancel()
-  ]])
+  vim.keymap.set("n", "<CR>", M.choose, { buffer = bufnr })
+  vim.keymap.set("n", "<C-c>", M.cancel, { buffer = bufnr })
+  vim.keymap.set("n", "<Esc>", M.cancel, { buffer = bufnr })
+  vim.api.nvim_create_autocmd("BufLeave", {
+    desc = "Cancel vim.ui.select",
+    buffer = bufnr,
+    nested = true,
+    once = true,
+    callback = M.cancel,
+  })
 end
 
 local function close_window()