From be90aba543fecaef477c8ee87e06db1a93dc03ab Mon Sep 17 00:00:00 2001 From: siduck76 Date: Wed, 17 Mar 2021 21:21:02 +0530 Subject: [PATCH] lsp.buf.hover (#3) --- lua/nvim-lspconfig/lua.lua | 45 +++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/lua/nvim-lspconfig/lua.lua b/lua/nvim-lspconfig/lua.lua index c3aba0d..6042601 100644 --- a/lua/nvim-lspconfig/lua.lua +++ b/lua/nvim-lspconfig/lua.lua @@ -1,33 +1,32 @@ vim.cmd [[packadd nvim-lspconfig]] vim.cmd [[packadd nvim-compe]] -local function map(mode, lhs, rhs, opts) - local options = {noremap = true} - if opts then - options = vim.tbl_extend("force", options, opts) - end - vim.api.nvim_set_keymap(mode, lhs, rhs, options) +local function buf_set_keymap(...) + vim.api.nvim_buf_set_keymap(bufnr, ...) +end +local function buf_set_option(...) + vim.api.nvim_buf_set_option(bufnr, ...) end -local opts = {noremap = true, silent = true} +buf_set_option("omnifunc", "v:lua.vim.lsp.omnifunc") -- Mappings. -map("n", "gd", "lua vim.lsp.buf.definition()", opts) -map("n", "gD", "lua vim.lsp.buf.declaration()", opts) -map("n", "gr", "lua vim.lsp.buf.references()", opts) - -map("n", "K", "lua vim.lsp.buf.hover()", opts) -map("n", "gi", "lua vim.lsp.buf.implementation()", opts) -map("n", "", "lua vim.lsp.buf.signature_help()", opts) -map("n", "wa", "lua vim.lsp.buf.add_workspace_folder()", opts) -map("n", "wr", "lua vim.lsp.buf.remove_workspace_folder()", opts) -map("n", "wl", "lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))", opts) -map("n", "D", "lua vim.lsp.buf.type_definition()", opts) -map("n", "rn", "lua vim.lsp.buf.rename()", opts) -map("n", "e", "lua vim.lsp.diagnostic.show_line_diagnostics()", opts) -map("n", "[d", "lua vim.lsp.diagnostic.goto_prev()", opts) -map("n", "]d", "lua vim.lsp.diagnostic.goto_next()", opts) -map("n", "q", "lua vim.lsp.diagnostic.set_loclist()", opts) +local opts = {noremap = true, silent = true} +buf_set_keymap("n", "gD", "lua vim.lsp.buf.declaration()", opts) +buf_set_keymap("n", "gd", "lua vim.lsp.buf.definition()", opts) +buf_set_keymap("n", "K", "lua vim.lsp.buf.hover()", opts) +buf_set_keymap("n", "gi", "lua vim.lsp.buf.implementation()", opts) +buf_set_keymap("n", "", "lua vim.lsp.buf.signature_help()", opts) +buf_set_keymap("n", "wa", "lua vim.lsp.buf.add_workspace_folder()", opts) +buf_set_keymap("n", "wr", "lua vim.lsp.buf.remove_workspace_folder()", opts) +buf_set_keymap("n", "wl", "lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))", opts) +buf_set_keymap("n", "D", "lua vim.lsp.buf.type_definition()", opts) +buf_set_keymap("n", "rn", "lua vim.lsp.buf.rename()", opts) +buf_set_keymap("n", "gr", "lua vim.lsp.buf.references()", opts) +buf_set_keymap("n", "e", "lua vim.lsp.diagnostic.show_line_diagnostics()", opts) +buf_set_keymap("n", "[d", "lua vim.lsp.diagnostic.goto_prev()", opts) +buf_set_keymap("n", "]d", "lua vim.lsp.diagnostic.goto_next()", opts) +buf_set_keymap("n", "q", "lua vim.lsp.diagnostic.set_loclist()", opts) -- lsp for html , css and js/ts require "lspconfig".tsserver.setup {}