From 26921309ec003a2f829a6ff4efd152c7725069bf Mon Sep 17 00:00:00 2001 From: jdhao Date: Sat, 15 Oct 2022 18:59:33 +0800 Subject: [PATCH] replace more viml with native lua code --- lua/config/dashboard-nvim.lua | 17 ++++++++++------- lua/config/lsp.lua | 22 +++++++++++++++++----- 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/lua/config/dashboard-nvim.lua b/lua/config/dashboard-nvim.lua index 9329953..7bcf1ff 100644 --- a/lua/config/dashboard-nvim.lua +++ b/lua/config/dashboard-nvim.lua @@ -1,3 +1,5 @@ +local api = vim.api +local keymap = vim.keymap local dashboard = require("dashboard") dashboard.custom_header = { @@ -56,10 +58,11 @@ dashboard.custom_center = { }, } -vim.cmd([[ - augroup dashboard_enter - au! - autocmd FileType dashboard nnoremap q :qa - autocmd FileType dashboard nnoremap e :enew - augroup END -]]) +api.nvim_create_autocmd("FileType", { + pattern = "dashboard", + group = api.nvim_create_augroup("dashboard_enter", { clear = true }), + callback = function () + keymap.set("n", "q", ":qa", { buffer = true, silent = true }) + keymap.set("n", "e", ":enew", { buffer = true, silent = true }) + end +}) diff --git a/lua/config/lsp.lua b/lua/config/lsp.lua index adc96a0..79bd0ce 100644 --- a/lua/config/lsp.lua +++ b/lua/config/lsp.lua @@ -69,12 +69,24 @@ local custom_attach = function(client, bufnr) hi! link LspReferenceRead Visual hi! link LspReferenceText Visual hi! link LspReferenceWrite Visual - augroup lsp_document_highlight - autocmd! * - autocmd CursorHold lua vim.lsp.buf.document_highlight() - autocmd CursorMoved lua vim.lsp.buf.clear_references() - augroup END ]]) + + local gid = api.nvim_create_augroup("lsp_document_highlight", { clear = true }) + api.nvim_create_autocmd("CursorHold" , { + group = gid, + buffer = bufnr, + callback = function () + lsp.buf.document_highlight() + end + }) + + api.nvim_create_autocmd("CursorMoved" , { + group = gid, + buffer = bufnr, + callback = function () + lsp.buf.clear_references() + end + }) end if vim.g.logging_level == "debug" then