diff --git a/lua/navigator.lua b/lua/navigator.lua index 0197073..455040a 100755 --- a/lua/navigator.lua +++ b/lua/navigator.lua @@ -27,8 +27,6 @@ _NgConfigValues = { -- your on_attach will be called at end of navigator on_attach end, ts_fold = false, - -- code_action_prompt = {enable = true, sign = true, sign_priority = 40, virtual_text = true}, - -- code_lens_action_prompt = {enable = true, sign = true, sign_priority = 40, virtual_text = true}, treesitter_analysis = true, -- treesitter variable context 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 @@ -58,7 +56,6 @@ _NgConfigValues = { format_on_save = true, -- set to false to disasble lsp code format on save (if you are using prettier/efm/formater etc) disable_format_cap = {}, -- a list of lsp disable file format (e.g. if you using efm or vim-codeformat etc), empty by default disable_lsp = {}, -- a list of lsp server disabled for your project, e.g. denols and tsserver you may - code_lens = false, -- only want to enable one lsp server disply_diagnostic_qf = true, -- always show quickfix if there are diagnostic errors diagnostic_load_files = false, -- lsp diagnostic errors list may contains uri that not opened yet set to true @@ -133,6 +130,10 @@ M.deprecated = function(cfg) warn('disable_format_ft renamed to disable_format_cap') end + if cfg.lsp ~= nil and cfg.lsp.code_lens == true then + warn('code_lens moved to lsp.code_lens_action') + end + if cfg.lspinstall ~= nil then warn('lspinstall deprecated, please use lsp-installer instead or use "lspinstall" branch') end diff --git a/lua/navigator/lspclient/clients.lua b/lua/navigator/lspclient/clients.lua index bb26d7e..afb888f 100644 --- a/lua/navigator/lspclient/clients.lua +++ b/lua/navigator/lspclient/clients.lua @@ -741,7 +741,7 @@ local function setup(user_opts, cnt) 'windline', } for i = 1, #disable_ft do - if ft == disable_ft[i] or _LoadedFiletypes[ft] then + if ft == disable_ft[i] then trace('navigator disabled for ft or it is loaded', ft) return end @@ -789,12 +789,12 @@ local function setup(user_opts, cnt) lsp_startup(ft, retry, lsp_opts) - --- if code line enabled - if _NgConfigValues.lsp.code_lens then + --- if code lens enabled + if _NgConfigValues.lsp.code_lens_action.enable then require('navigator.codelens').setup() end - -- _LoadedFiletypes[ft .. tostring(bufnr)] = true + -- _LoadedFiletypes[ft .. tostring(bufnr)] = true -- may prevent lsp config when reboot lsp end local function on_filetype()