From 14860072d024b7e6f60dd748d90e5b42e750f9f1 Mon Sep 17 00:00:00 2001 From: jdhao Date: Tue, 6 Sep 2022 21:53:44 +0800 Subject: [PATCH] use local keymap --- lua/config/git-linker.lua | 3 ++- lua/config/hlslens.lua | 12 +++++------ lua/config/lsp.lua | 43 ++++++++++++++++++++------------------- lua/config/nvim-tree.lua | 5 +++-- lua/config/nvim_hop.lua | 3 ++- 5 files changed, 35 insertions(+), 31 deletions(-) diff --git a/lua/config/git-linker.lua b/lua/config/git-linker.lua index 72ae3f6..f19210b 100644 --- a/lua/config/git-linker.lua +++ b/lua/config/git-linker.lua @@ -1,10 +1,11 @@ +local keymap = vim.keymap local gitlinker = require('gitlinker') gitlinker.setup({ mappings = nil, }) -vim.keymap.set({ 'n', 'v' }, 'gl', '', { +keymap.set({ 'n', 'v' }, 'gl', '', { silent = true, desc = "get git permlink", callback = function() diff --git a/lua/config/hlslens.lua b/lua/config/hlslens.lua index cacac56..5b2199d 100644 --- a/lua/config/hlslens.lua +++ b/lua/config/hlslens.lua @@ -1,3 +1,5 @@ +local keymap = vim.keymap + require('hlslens').setup({ calm_down = true, nearest_only = true, @@ -16,19 +18,17 @@ local activate_hlslens = function(direction) require('hlslens').start() end -vim.keymap.set('n', 'n', '', +keymap.set('n', 'n', '', { - noremap = true, silent = true, callback = function() activate_hlslens('n') end }) -vim.keymap.set('n', 'N', '', +keymap.set('n', 'N', '', { - noremap = true, silent = true, callback = function() activate_hlslens('N') end }) -vim.keymap.set('n', '*', "(asterisk-z*)lua require('hlslens').start()", { silent = true }) -vim.keymap.set('n', '#', "(asterisk-z#)lua require('hlslens').start()", { silent = true }) +keymap.set('n', '*', "(asterisk-z*)lua require('hlslens').start()", { silent = true }) +keymap.set('n', '#', "(asterisk-z#)lua require('hlslens').start()", { silent = true }) diff --git a/lua/config/lsp.lua b/lua/config/lsp.lua index 45b722b..43586c2 100644 --- a/lua/config/lsp.lua +++ b/lua/config/lsp.lua @@ -1,5 +1,6 @@ local fn = vim.fn local api = vim.api +local keymap = vim.keymap local lsp = vim.lsp local utils = require("utils") @@ -7,19 +8,27 @@ local utils = require("utils") local custom_attach = function(client, bufnr) -- Mappings. local opts = { silent = true, buffer = bufnr } - vim.keymap.set("n", "gd", vim.lsp.buf.definition, opts) - vim.keymap.set("n", "", vim.lsp.buf.definition, opts) - vim.keymap.set("n", "K", vim.lsp.buf.hover, opts) - vim.keymap.set("n", "", vim.lsp.buf.signature_help, opts) - vim.keymap.set("n", "wa", vim.lsp.buf.add_workspace_folder, opts) - vim.keymap.set("n", "wr", vim.lsp.buf.remove_workspace_folder, opts) - vim.keymap.set("n", "wl", function() inspect(vim.lsp.buf.list_workspace_folders()) end, opts) - vim.keymap.set("n", "rn", vim.lsp.buf.rename, opts) - vim.keymap.set("n", "gr", vim.lsp.buf.references, opts) - vim.keymap.set("n", "[d", vim.diagnostic.goto_prev, opts) - vim.keymap.set("n", "]d", vim.diagnostic.goto_next, opts) - vim.keymap.set("n", "q", function() vim.diagnostic.setqflist({open = true}) end, opts) - vim.keymap.set("n", "ca", vim.lsp.buf.code_action, opts) + keymap.set("n", "gd", vim.lsp.buf.definition, opts) + keymap.set("n", "", vim.lsp.buf.definition, opts) + keymap.set("n", "K", vim.lsp.buf.hover, opts) + keymap.set("n", "", vim.lsp.buf.signature_help, opts) + keymap.set("n", "rn", vim.lsp.buf.rename, opts) + keymap.set("n", "gr", vim.lsp.buf.references, opts) + keymap.set("n", "[d", vim.diagnostic.goto_prev, opts) + keymap.set("n", "]d", vim.diagnostic.goto_next, opts) + keymap.set("n", "q", function() vim.diagnostic.setqflist({open = true}) end, opts) + keymap.set("n", "ca", vim.lsp.buf.code_action, opts) + keymap.set("n", "wa", vim.lsp.buf.add_workspace_folder, opts) + keymap.set("n", "wr", vim.lsp.buf.remove_workspace_folder, opts) + keymap.set("n", "wl", function() inspect(vim.lsp.buf.list_workspace_folders()) end, opts) + + -- Set some key bindings conditional on server capabilities + if client.resolved_capabilities.document_formatting then + keymap.set("n", "f", vim.lsp.buf.formatting_sync, opts) + end + if client.resolved_capabilities.document_range_formatting then + keymap.set("x", "f", vim.lsp.buf.range_formatting, opts) + end api.nvim_create_autocmd("CursorHold", { buffer=bufnr, @@ -47,14 +56,6 @@ local custom_attach = function(client, bufnr) end }) - -- Set some key bindings conditional on server capabilities - if client.resolved_capabilities.document_formatting then - vim.keymap.set("n", "f", vim.lsp.buf.formatting_sync, opts) - end - if client.resolved_capabilities.document_range_formatting then - vim.keymap.set("x", "f", vim.lsp.buf.range_formatting, opts) - end - -- The blow command will highlight the current variable and its usages in the buffer. if client.resolved_capabilities.document_highlight then vim.cmd([[ diff --git a/lua/config/nvim-tree.lua b/lua/config/nvim-tree.lua index d400822..c34c1d5 100644 --- a/lua/config/nvim-tree.lua +++ b/lua/config/nvim-tree.lua @@ -1,3 +1,4 @@ +local keymap = vim.keymap local nvim_tree = require("nvim-tree") nvim_tree.setup({ @@ -113,7 +114,7 @@ nvim_tree.setup({ }, }) -vim.keymap.set('n', 's', function() +keymap.set('n', 's', function() return require('nvim-tree').toggle(false, true) end, -{ noremap = true, silent = true, desc = "toggle nvim-tree"}) + { silent = true, desc = "toggle nvim-tree" }) diff --git a/lua/config/nvim_hop.lua b/lua/config/nvim_hop.lua index 631eb60..b774046 100644 --- a/lua/config/nvim_hop.lua +++ b/lua/config/nvim_hop.lua @@ -2,6 +2,7 @@ vim.cmd [[hi HopNextKey cterm=bold ctermfg=176 gui=bold guibg=#ff00ff guifg=#fff vim.cmd [[hi HopNextKey1 cterm=bold ctermfg=176 gui=bold guibg=#ff00ff guifg=#ffffff]] vim.cmd [[hi HopNextKey2 cterm=bold ctermfg=176 gui=bold guibg=#ff00ff guifg=#ffffff]] +local keymap = vim.keymap local hop = require "hop" hop.setup({ case_insensitive = true, @@ -9,7 +10,7 @@ hop.setup({ quit_key = "", }) -vim.keymap.set({ "n", "v", "o" }, "f", "", { +keymap.set({ "n", "v", "o" }, "f", "", { silent = true, noremap = true, callback = function()