From c96dec49ee8553dce6740fd0d6b696c5d145a60b Mon Sep 17 00:00:00 2001
From: c-my <cmy1113@outlook.com>
Date: Sat, 16 Apr 2022 10:54:35 +0800
Subject: [PATCH] keymap: use 0.7 new api

---
 lua/configs/keymaps.lua               | 43 +++++++++++++--------------
 lua/configs/plugins/lsp_installer.lua | 29 +++++++++---------
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/lua/configs/keymaps.lua b/lua/configs/keymaps.lua
index 4ec8e40..72c6746 100644
--- a/lua/configs/keymaps.lua
+++ b/lua/configs/keymaps.lua
@@ -1,9 +1,8 @@
 local opts = {
-    noremap = true,
     silent = true
 }
 
-vim.api.nvim_set_keymap('', '<Space>', '<Nop>', opts)
+vim.keymap.set('', '<Space>', '<Nop>', opts)
 vim.g.mapleader = ' '
 vim.g.maplocalleader = ' '
 
@@ -11,33 +10,33 @@ vim.g.maplocalleader = ' '
 -- == re-indents the line to suit its new position
 -- gc reselects the last visual block
 -- = re-indents the block
-vim.api.nvim_set_keymap('n', '<A-j>', ':m .+1<CR>==', opts)
-vim.api.nvim_set_keymap('n', '<A-k>', ':m .-2<CR>==', opts)
-vim.api.nvim_set_keymap('i', '<A-j>', '<Esc>:m .+1<CR>==gi', opts)
-vim.api.nvim_set_keymap('i', '<A-k>', '<Esc>:m .-2<CR>==gi', opts)
-vim.api.nvim_set_keymap('v', '<A-j>', ":m '>+1<CR>gv=gv", opts)
-vim.api.nvim_set_keymap('v', '<A-k>', ":m '<-2<CR>gv=gv", opts)
+vim.keymap.set('n', '<A-j>', ':m .+1<CR>==', opts)
+vim.keymap.set('n', '<A-k>', ':m .-2<CR>==', opts)
+vim.keymap.set('i', '<A-j>', '<Esc>:m .+1<CR>==gi', opts)
+vim.keymap.set('i', '<A-k>', '<Esc>:m .-2<CR>==gi', opts)
+vim.keymap.set('v', '<A-j>', ":m '>+1<CR>gv=gv", opts)
+vim.keymap.set('v', '<A-k>', ":m '<-2<CR>gv=gv", opts)
 
 -- Navigating window
-vim.api.nvim_set_keymap('n', '<C-h>', '<C-w>h', opts)
-vim.api.nvim_set_keymap('n', '<C-j>', '<C-w>j', opts)
-vim.api.nvim_set_keymap('n', '<C-k>', '<C-w>k', opts)
-vim.api.nvim_set_keymap('n', '<C-l>', '<C-w>l', opts)
+vim.keymap.set('n', '<C-h>', '<C-w>h', opts)
+vim.keymap.set('n', '<C-j>', '<C-w>j', opts)
+vim.keymap.set('n', '<C-k>', '<C-w>k', opts)
+vim.keymap.set('n', '<C-l>', '<C-w>l', opts)
 
 -- Keymaps for NvimTree
-vim.api.nvim_set_keymap('n', '<C-n>', ':NvimTreeFindFileToggle <CR>', opts)
-vim.api.nvim_set_keymap('n', '<leader>a', ':NvimTreeFocus <CR>', opts)
+vim.keymap.set('n', '<C-n>', ':NvimTreeFindFileToggle <CR>', opts)
+vim.keymap.set('n', '<leader>a', ':NvimTreeFocus <CR>', opts)
 
 -- Keymaps for Telescope
-vim.api.nvim_set_keymap('n', '<leader>ff', ':Telescope find_files <CR>', opts)
-vim.api.nvim_set_keymap('n', '<leader>fg', ':Telescope live_grep <CR>', opts)
-vim.api.nvim_set_keymap('n', '<leader>fb', ':Telescope buffers <CR>', opts)
-vim.api.nvim_set_keymap('n', '<leader>fh', ':Telescope help_tags <CR>', opts)
+vim.keymap.set('n', '<leader>ff', ':Telescope find_files <CR>', opts)
+vim.keymap.set('n', '<leader>fg', ':Telescope live_grep <CR>', opts)
+vim.keymap.set('n', '<leader>fb', ':Telescope buffers <CR>', opts)
+vim.keymap.set('n', '<leader>fh', ':Telescope help_tags <CR>', opts)
 
 -- Keymaps for LSP
 -- Mappings.
 -- See `:help vim.diagnostic.*` for documentation on any of the below functions
-vim.api.nvim_set_keymap('n', '<space>e', '<cmd>lua vim.diagnostic.open_float()<CR>', opts)
-vim.api.nvim_set_keymap('n', '[d', '<cmd>lua vim.diagnostic.goto_prev()<CR>', opts)
-vim.api.nvim_set_keymap('n', ']d', '<cmd>lua vim.diagnostic.goto_next()<CR>', opts)
-vim.api.nvim_set_keymap('n', '<space>q', '<cmd>lua vim.diagnostic.setloclist()<CR>', opts)
+vim.keymap.set('n', '<space>e', '<cmd>lua vim.diagnostic.open_float()<CR>', opts)
+vim.keymap.set('n', '[d', '<cmd>lua vim.diagnostic.goto_prev()<CR>', opts)
+vim.keymap.set('n', ']d', '<cmd>lua vim.diagnostic.goto_next()<CR>', opts)
+vim.keymap.set('n', '<space>q', '<cmd>lua vim.diagnostic.setloclist()<CR>', opts)
diff --git a/lua/configs/plugins/lsp_installer.lua b/lua/configs/plugins/lsp_installer.lua
index 31c0ab2..3611f0f 100644
--- a/lua/configs/plugins/lsp_installer.lua
+++ b/lua/configs/plugins/lsp_installer.lua
@@ -9,27 +9,28 @@ end
 local on_attach = function(client, bufnr)
     local opts = {
         noremap = true,
-        silent = true
+        silent = true,
+        buffer = bufnr,
     }
     -- Enable completion triggered by <c-x><c-o>
     vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
 
     -- Mappings.
     -- See `:help vim.lsp.*` for documentation on any of the below functions
-    vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
-    vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
-    vim.api.nvim_buf_set_keymap(bufnr, 'n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
-    vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
-    vim.api.nvim_buf_set_keymap(bufnr, 'n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
-    vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
-    vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
-    vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>wl',
+    vim.keymap.set('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
+    vim.keymap.set('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
+    vim.keymap.set('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
+    vim.keymap.set('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
+    vim.keymap.set('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
+    vim.keymap.set('n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
+    vim.keymap.set('n', '<space>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
+    vim.keymap.set('n', '<space>wl',
         '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
-    vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
-    vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
-    vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
-    vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
-    vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
+    vim.keymap.set('n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
+    vim.keymap.set('n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
+    vim.keymap.set('n', '<space>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
+    vim.keymap.set('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
+    vim.keymap.set('n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
 end
 
 -- Register a handler that will be called for each installed server when it's ready (i.e. when installation is finished