use vim.kemap.set

Author: aceforeverd

lua/aceforeverd/config/finder.lua

@@ -70,26 +70,26 @@ function M.telescope()
   local tel_map_list = {
     ['<space>'] = {
       ['<space>'] = [[<cmd>Telescope<CR>]],
-      ['b'] = "<cmd>lua require('telescope.builtin').buffers()<cr>",
-      ['c'] = "<cmd>lua require('telescope.builtin').commands()<cr>",
-      ['R'] = [[<cmd>lua require('telescope.builtin').live_grep{}<cr>]],
+      ['b'] = function() require('telescope.builtin').buffers() end,
+      ['c'] = function() require('telescope.builtin').commands() end,
+      ['R'] = function() require('telescope.builtin').live_grep{} end,
     },
     ['<leader>f'] = {
       -- general case
-      ['f'] = [[<Cmd>lua require('telescope.builtin').find_files()<CR>]],
-      ['e'] = [[<Cmd>lua require('telescope.builtin').grep_string{}<CR>]],
-      ['s'] = [[<cmd>lua require('telescope.builtin').spell_suggest()<CR>]],
-      ['o'] = [[<cmd>lua require("telescope").extensions.repo.list{}<cr>]],
-      ['r'] = [[<Cmd>lua require('telescope').extensions.frecency.frecency()<CR>]],
-      ['j'] = [[<Cmd>lua require'telescope'.extensions.projects.projects{}<CR>]],
+      ['f'] = function() require('telescope.builtin').find_files() end,
+      ['e'] = function() require('telescope.builtin').grep_string{} end,
+      ['s'] = function() require('telescope.builtin').spell_suggest() end,
+      ['o'] = function() require("telescope").extensions.repo.list{} end,
+      ['r'] = function() require('telescope').extensions.frecency.frecency() end,
+      ['j'] = function() require'telescope'.extensions.projects.projects{} end,
 
-      ['I'] = "<cmd>lua require'telescope'.extensions.gh.issues()<cr>",
-      ['P'] = "<cmd>lua require'telescope'.extensions.gh.pull_request()<cr>",
-      ['R'] = "<cmd>lua require'telescope'.extensions.gh.run()<cr>",
-      ['G'] = "<cmd>lua require'telescope'.extensions.gh.gist()<cr>",
+      ['I'] = function() require'telescope'.extensions.gh.issues() end,
+      ['P'] = function() require'telescope'.extensions.gh.pull_request() end,
+      ['R'] = function() require'telescope'.extensions.gh.run() end,
+      ['G'] = function() require'telescope'.extensions.gh.gist() end,
 
-      ['z'] = '<cmd>lua require"telescope".extensions.zoxide.list{}<cr>',
-      ['l'] = [[<cmd>lua require"telescope".extensions.file_browser.file_browser()<cr>]],
+      ['z'] = function() require"telescope".extensions.zoxide.list{} end,
+      ['l'] = function() require"telescope".extensions.file_browser.file_browser() end,
     },
     ['<leader>q'] = {
       f = '<cmd>FzfLua quickfix<cr>',
@@ -98,8 +98,8 @@ function M.telescope()
     },
     ['<leader>l'] = {
       -- lsp
-      ['s'] = [[<cmd>lua require('telescope.builtin').lsp_document_symbols()<cr>]],
-      ['S'] = [[<cmd>lua require('telescope.builtin').lsp_workspace_symbols()<cr>]],
+      ['s'] = function() require('telescope.builtin').lsp_document_symbols() end,
+      ['S'] = function() require('telescope.builtin').lsp_workspace_symbols() end,
     },
     ['<leader>g'] = {
       -- git ops

lua/aceforeverd/util/map.lua

@@ -16,13 +16,10 @@
 
 local M = {}
 
--- some mapping may not work for nvim < 0.7.0 due to can't map function-rhs
-local map_fn = vim.keymap.set
-
 --- create map based on a table
----@param map_list dict first level key should be vim mode name, e.g 'n', 'v'
+---@param map_list {} first level key should be vim mode name, e.g 'n', 'v'
 --                      TODO: for nvim >= 0.7, first level key can be a list e.g { 'n', 'x' }
----@param map_opts dict
+---@param map_opts {}
 function M.do_map(map_list, map_opts)
   if type(map_list) ~= "table" then
     vim.api.nvim_notify('[skip]: map_list not a table: ' .. vim.inspect(map_list), vim.log.levels.WARN, {})
@@ -44,23 +41,7 @@ function M.do_mode_map(mode, prefix, map_list, map_opts)
       M.do_mode_map(mode, prefix .. key, value)
     end
   else
-    M.set_map(mode, prefix, map_list, map_opts or {})
-  end
-end
-
-function M.set_map(mode, lhs, rhs, opts)
-  if type(rhs) == 'string' then
-    map_fn(mode, lhs, rhs, opts or {})
-  elseif type(rhs) == 'function' then
-    if vim.fn.has('nvim-0.7.0') == 1 then
-      map_fn(mode, lhs, rhs, opts or {})
-    else
-      vim.api.nvim_notify('[skip]: map function-rhs for neovim < 0.7.0: ' .. vim.inspect(rhs), vim.log.levels.WARN, {})
-    end
-  else
-
-    vim.api.nvim_notify('[skip]: map rhs is not string/function: ' ..
-      vim.inspect(rhs), vim.log.levels.WARN, {})
+    vim.keymap.set(mode, prefix, map_list, map_opts or {})
   end
 end