summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lua/default-config.lua4
-rw-r--r--lua/lsp/init.lua16
-rw-r--r--lua/lv-which-key/init.lua4
3 files changed, 20 insertions, 4 deletions
diff --git a/lua/default-config.lua b/lua/default-config.lua
index 3f8bbc34..661f8f23 100644
--- a/lua/default-config.lua
+++ b/lua/default-config.lua
@@ -31,6 +31,10 @@ O = {
rainbow = { enabled = false },
},
+ lsp = {
+ popup_border = "single"
+ },
+
database = { save_location = "~/.config/nvcode_db", auto_execute = 1 },
plugin = {
diff --git a/lua/lsp/init.lua b/lua/lsp/init.lua
index ad8985d8..0292064a 100644
--- a/lua/lsp/init.lua
+++ b/lua/lsp/init.lua
@@ -22,8 +22,8 @@ vim.cmd("nnoremap <silent> gr <cmd>lua vim.lsp.buf.references()<CR>")
vim.cmd("nnoremap <silent> gi <cmd>lua vim.lsp.buf.implementation()<CR>")
vim.cmd("nnoremap <silent> K :lua vim.lsp.buf.hover()<CR>")
-- vim.cmd('nnoremap <silent> <C-k> <cmd>lua vim.lsp.buf.signature_help()<CR>')
-vim.cmd("nnoremap <silent> <C-p> :lua vim.lsp.diagnostic.goto_prev()<CR>")
-vim.cmd("nnoremap <silent> <C-n> :lua vim.lsp.diagnostic.goto_next()<CR>")
+vim.cmd("nnoremap <silent> <C-p> :lua vim.lsp.diagnostic.goto_prev({popup_opts = {border = O.lsp.popup_border}})<CR>")
+vim.cmd("nnoremap <silent> <C-n> :lua vim.lsp.diagnostic.goto_next({popup_opts = {border = O.lsp.popup_border}})<CR>")
-- scroll down hover doc or scroll in definition preview
-- scroll up hover doc
vim.cmd('command! -nargs=0 LspVirtualTextToggle lua require("lsp/virtual_text").toggle()')
@@ -41,6 +41,18 @@ vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(
}
)
+vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(
+ vim.lsp.handlers.hover, {
+ border = O.lsp.popup_border
+ }
+)
+
+vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(
+ vim.lsp.handlers.signature_help, {
+ border = O.lsp.popup_border
+ }
+)
+
-- symbols for autocomplete
vim.lsp.protocol.CompletionItemKind = {
" ï’ž (Text) ",
diff --git a/lua/lv-which-key/init.lua b/lua/lv-which-key/init.lua
index 31ecf94c..b35b546e 100644
--- a/lua/lv-which-key/init.lua
+++ b/lua/lv-which-key/init.lua
@@ -200,8 +200,8 @@ local mappings = {
},
f = { "<cmd>lua vim.lsp.buf.formatting()<cr>", "Format" },
i = { "<cmd>LspInfo<cr>", "Info" },
- j = { "<cmd>lua vim.lsp.diagnostic.goto_next()<cr>", "Next Diagnostic" },
- k = { "<cmd>lua vim.lsp.diagnostic.goto_prev()<cr>", "Prev Diagnostic" },
+ j = { "<cmd>lua vim.lsp.diagnostic.goto_next({popup_opts = {border = O.lsp.popup_border}})<cr>", "Next Diagnostic" },
+ k = { "<cmd>lua vim.lsp.diagnostic.goto_prev({popup_opts = {border = O.lsp.popup_border}})<cr>", "Prev Diagnostic" },
q = { "<cmd>Telescope quickfix<cr>", "Quickfix" },
r = { "<cmd>lua vim.lsp.buf.rename()<cr>", "Rename" },
s = {