From bd0d892f2224279880a592279170d863545d4438 Mon Sep 17 00:00:00 2001 From: ray-x Date: Fri, 14 May 2021 19:33:12 +1000 Subject: [PATCH] lua-format --- lua/navigator/lspclient/mapping.lua | 45 ++++++++++------------------- 1 file changed, 15 insertions(+), 30 deletions(-) diff --git a/lua/navigator/lspclient/mapping.lua b/lua/navigator/lspclient/mapping.lua index 81d0904..47d9341 100644 --- a/lua/navigator/lspclient/mapping.lua +++ b/lua/navigator/lspclient/mapping.lua @@ -3,8 +3,7 @@ local function set_keymap(...) vim.api.nvim_set_keymap(...) end local event_hdlrs = { {ev = "BufWritePre", func = "diagnostic.set_loclist({open_loclist = false})"}, - {ev = "CursorHold", func = "document_highlight()"}, - {ev = "CursorHoldI", func = "document_highlight()"}, + {ev = "CursorHold", func = "document_highlight()"}, {ev = "CursorHoldI", func = "document_highlight()"}, {ev = "CursorMoved", func = "clear_references()"} } @@ -12,15 +11,13 @@ local key_maps = { {key = "gr", func = "references()"}, {mode = "i", key = "", func = "signature_help()"}, {key = "gs", func = "signature_help()"}, {key = "g0", func = "document_symbol()"}, {key = "gW", func = "workspace_symbol()"}, {key = "", func = "definition()"}, - {key = "gD", func = "declaration()"}, - {key = "gp", func = "require('navigator.definition').definition_preview()"}, + {key = "gD", func = "declaration()"}, {key = "gp", func = "require('navigator.definition').definition_preview()"}, {key = "gT", func = "require('navigator.treesitter').buf_ts()"}, {key = "GT", func = "require('navigator.treesitter').bufs_ts()"}, {key = "K", func = "hover()"}, - {key = "ga", mode = "n", func = "code_action()"}, - {key = "ga", mode = "v", func = "range_code_action()"}, {key = "re", func = "rename()"}, - {key = "gi", func = "incoming_calls()"}, {key = "go", func = "outgoing_calls()"}, - {key = "gi", func = "implementation()"}, {key = "gt", func = "type_definition()"}, - {key = "gL", func = "diagnostic.show_line_diagnostics()"}, + {key = "ga", mode = "n", func = "code_action()"}, {key = "ga", mode = "v", func = "range_code_action()"}, + {key = "re", func = "rename()"}, {key = "gi", func = "incoming_calls()"}, + {key = "go", func = "outgoing_calls()"}, {key = "gi", func = "implementation()"}, + {key = "gt", func = "type_definition()"}, {key = "gL", func = "diagnostic.show_line_diagnostics()"}, {key = "gG", func = "require('navigator.diagnostics').show_diagnostic()"}, {key = "]d", func = "diagnostic.goto_next()"}, {key = "[d", func = "diagnostic.goto_prev()"}, {key = "]r", func = "require('navigator.treesitter').goto_next_usage()"}, @@ -80,9 +77,7 @@ local function set_mapping(user_opts) vim.cmd([[autocmd BufWritePre lua vim.lsp.buf.formatting()]]) end -- if user_opts.cap.document_range_formatting then - if range_fmt then - buf_set_keymap("v", "ff", "lua vim.lsp.buf.range_formatting()", opts) - end + if range_fmt then buf_set_keymap("v", "ff", "lua vim.lsp.buf.range_formatting()", opts) end end local function set_event_handler(user_opts) @@ -99,8 +94,7 @@ local function set_event_handler(user_opts) else f = "lua vim.lsp.buf." .. value.func end - local cmd = "autocmd FileType " .. file_types .. " autocmd nvim_lsp_autos " .. value.ev .. - " silent! " .. f + local cmd = "autocmd FileType " .. file_types .. " autocmd nvim_lsp_autos " .. value.ev .. " silent! " .. f vim.api.nvim_command(cmd) end vim.api.nvim_command([[augroup END]]) @@ -115,12 +109,9 @@ function M.setup(user_opts) set_mapping(user_opts) set_event_handler(user_opts) local cap = user_opts.cap or {} - log(cap) if cap.call_hierarchy or cap.callHierarchy then - vim.lsp.handlers["callHierarchy/incomingCalls"] = - require"navigator.hierarchy".incoming_calls_handler - vim.lsp.handlers["callHierarchy/outgoingCalls"] = - require"navigator.hierarchy".outgoing_calls_handler + vim.lsp.handlers["callHierarchy/incomingCalls"] = require"navigator.hierarchy".incoming_calls_handler + vim.lsp.handlers["callHierarchy/outgoingCalls"] = require"navigator.hierarchy".outgoing_calls_handler end vim.lsp.handlers["textDocument/references"] = require"navigator.reference".reference_handler @@ -131,21 +122,15 @@ function M.setup(user_opts) vim.lsp.handlers["textDocument/declaration"] = require"navigator.definition".declaration_handler end - vim.lsp.handlers["textDocument/typeDefinition"] = - require"navigator.definition".typeDefinition_handler - vim.lsp.handlers["textDocument/implementation"] = - require"navigator.implementation".implementation_handler + vim.lsp.handlers["textDocument/typeDefinition"] = require"navigator.definition".typeDefinition_handler + vim.lsp.handlers["textDocument/implementation"] = require"navigator.implementation".implementation_handler - vim.lsp.handlers["textDocument/documentSymbol"] = - require"navigator.symbols".document_symbol_handler + vim.lsp.handlers["textDocument/documentSymbol"] = require"navigator.symbols".document_symbol_handler vim.lsp.handlers["workspace/symbol"] = require"navigator.symbols".workspace_symbol_handler - vim.lsp.handlers["textDocument/publishDiagnostics"] = - require"navigator.diagnostics".diagnostic_handler + vim.lsp.handlers["textDocument/publishDiagnostics"] = require"navigator.diagnostics".diagnostic_handler local hassig, sig = pcall(require, "lsp_signature") - if not hassig then - vim.lsp.handlers["textDocument/signatureHelp"] = require"navigator.signature".signature_handler - end + if not hassig then vim.lsp.handlers["textDocument/signatureHelp"] = require"navigator.signature".signature_handler end -- vim.lsp.handlers["textDocument/hover"] = require 'navigator.hover'.hover_handler end