From ff57a1f916313fb07ac7ada0b3ba5784ad1ab390 Mon Sep 17 00:00:00 2001 From: ray-x Date: Mon, 21 Feb 2022 11:42:24 +1100 Subject: [PATCH] force keymap to be loaded when on_attach is not called it may releated to #130 --- lua/navigator.lua | 4 ++-- lua/navigator/lspclient/mapping.lua | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lua/navigator.lua b/lua/navigator.lua index 380b659..31d01b5 100644 --- a/lua/navigator.lua +++ b/lua/navigator.lua @@ -33,7 +33,7 @@ _NgConfigValues = { transparency = 50, -- 0 ~ 100 blur the main window, 100: fully transparent, 0: opaque, set to nil to disable it lsp_signature_help = true, -- if you would like to hook ray-x/lsp_signature plugin in navigator -- setup here. if it is nil, navigator will not init signature help - signature_help_cfg = {debug=false}, -- if you would like to init ray-x/lsp_signature plugin in navigator, pass in signature help + signature_help_cfg = { debug = false }, -- if you would like to init ray-x/lsp_signature plugin in navigator, pass in signature help lsp = { code_action = { enable = true, @@ -224,7 +224,7 @@ M.setup = function(cfg) -- print("loading navigator") require('navigator.lazyloader').init() require('navigator.lspclient.clients').setup(_NgConfigValues) - -- require("navigator.lspclient.mapping").setup(_NgConfigValues) + require('navigator.lspclient.mapping').setup(_NgConfigValues) require('navigator.reference') require('navigator.definition') require('navigator.hierarchy') diff --git a/lua/navigator/lspclient/mapping.lua b/lua/navigator/lspclient/mapping.lua index 61190c3..7378c5c 100644 --- a/lua/navigator/lspclient/mapping.lua +++ b/lua/navigator/lspclient/mapping.lua @@ -172,7 +172,7 @@ local function set_mapping(user_opts) elseif fmtkey then del_keymap('n', fmtkey) end - if user_opts.cap.document_range_formatting then + if user_opts.cap and user_opts.cap.document_range_formatting then log('formatting enabled', user_opts.cap) end