From 0295f75c0759b39d31f3c2494604bba116f2f1f8 Mon Sep 17 00:00:00 2001 From: Matthew Leong Date: Wed, 4 Jan 2023 16:48:43 -0800 Subject: [PATCH] feat: clean up --- lua/cosmic/lsp/mappings.lua | 47 ++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/lua/cosmic/lsp/mappings.lua b/lua/cosmic/lsp/mappings.lua index a32228f..981779e 100644 --- a/lua/cosmic/lsp/mappings.lua +++ b/lua/cosmic/lsp/mappings.lua @@ -3,42 +3,41 @@ local M = {} -- Mappings. function M.init(client, bufnr) - -- See `:help vim.lsp.*` for documentation on any of the below functions - local function set_keymap(mode, lhs, rhs) + local function buf_map(mode, lhs, rhs) map(mode, lhs, rhs, { buffer = bufnr, }) end - set_keymap('n', 'gd', 'lua require("telescope.builtin").lsp_definitions()') - set_keymap('n', 'gD', 'lua vim.lsp.buf.declaration()') - set_keymap('n', 'gi', 'lua require("telescope.builtin").lsp_implementations()') - set_keymap('n', 'gt', 'lua require("telescope.builtin").lsp_type_definitions()') - set_keymap('n', 'gr', 'lua require("telescope.builtin").lsp_references()') - set_keymap('n', 'gn', 'lua require("cosmic-ui").rename()') + buf_map('n', 'gd', 'lua require("telescope.builtin").lsp_definitions()') + buf_map('n', 'gD', 'lua vim.lsp.buf.declaration()') + buf_map('n', 'gi', 'lua require("telescope.builtin").lsp_implementations()') + buf_map('n', 'gt', 'lua require("telescope.builtin").lsp_type_definitions()') + buf_map('n', 'gr', 'lua require("telescope.builtin").lsp_references()') + buf_map('n', 'gn', 'lua require("cosmic-ui").rename()') -- diagnostics - set_keymap('n', '[g', 'lua vim.diagnostic.goto_prev()') - set_keymap('n', ']g', 'lua vim.diagnostic.goto_next()') - set_keymap('n', 'ge', 'lua vim.diagnostic.open_float(nil, { scope = "line", })') - set_keymap('n', 'ge', 'Telescope diagnostics bufnr=0') + buf_map('n', '[g', 'lua vim.diagnostic.goto_prev()') + buf_map('n', ']g', 'lua vim.diagnostic.goto_next()') + buf_map('n', 'ge', 'lua vim.diagnostic.open_float(nil, { scope = "line", })') + buf_map('n', 'ge', 'Telescope diagnostics bufnr=0') -- hover - set_keymap('n', 'K', 'lua vim.lsp.buf.hover()') + buf_map('n', 'K', 'lua vim.lsp.buf.hover()') -- code actions - set_keymap('n', 'ga', 'lua require("cosmic-ui").code_actions()') - set_keymap('v', 'ga', 'lua require("cosmic-ui").range_code_actions()') + buf_map('n', 'ga', 'lua require("cosmic-ui").code_actions()') + buf_map('v', 'ga', 'lua require("cosmic-ui").range_code_actions()') -- formatting - set_keymap('n', 'gf', 'lua vim.lsp.buf.formatting()') - set_keymap('v', 'gf', 'lua vim.lsp.buf.range_formatting()') + buf_map('n', 'gf', 'lua vim.lsp.buf.formatting()') + buf_map('v', 'gf', 'lua vim.lsp.buf.range_formatting()') -- lsp workspace - set_keymap('n', 'wd', 'Telescope diagnostics') - set_keymap('n', 'wa', 'lua vim.lsp.buf.add_workspace_folder()') - set_keymap('n', 'wr', 'lua vim.lsp.buf.remove_workspace_folder()') - set_keymap( + buf_map('n', 'wd', 'Telescope diagnostics') + buf_map('n', 'wa', 'lua vim.lsp.buf.add_workspace_folder()') + buf_map('n', 'wr', 'lua vim.lsp.buf.remove_workspace_folder()') + buf_map( 'n', 'wl', 'lua require("cosmic.utils.logger"):log(vim.inspect(vim.lsp.buf.list_workspace_folders()))' @@ -46,9 +45,9 @@ function M.init(client, bufnr) if client.name == 'tsserver' then -- typescript helpers - set_keymap('n', 'gr', ':TSLspRenameFile') - set_keymap('n', 'go', ':TSLspOrganize') - set_keymap('n', 'gi', ':TSLspImportAll') + buf_map('n', 'gr', ':TSLspRenameFile') + buf_map('n', 'go', ':TSLspOrganize') + buf_map('n', 'gi', ':TSLspImportAll') end end