From 1fcb0045d1336ec36b852478ff0925f36882eb2d Mon Sep 17 00:00:00 2001 From: ray-x Date: Wed, 1 Feb 2023 10:15:24 +1100 Subject: [PATCH] deprecate vim.lsp.diagnostic --- lua/navigator/diagnostics.lua | 15 +++++++-------- lua/navigator/lspclient/mapping.lua | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/lua/navigator/diagnostics.lua b/lua/navigator/diagnostics.lua index e051b1d..24875d9 100644 --- a/lua/navigator/diagnostics.lua +++ b/lua/navigator/diagnostics.lua @@ -409,7 +409,7 @@ M.show_buf_diagnostics = function() end -- set loc list win -M.set_diag_loclist = function(bufnr) +M.setloclist = function(bufnr) bufnr = bufnr or api.nvim_get_current_buf() local diag_cnt = get_count(bufnr, [[Error]]) + get_count(bufnr, [[Warning]]) if diag_cnt == 0 then @@ -429,13 +429,8 @@ M.set_diag_loclist = function(bufnr) if not vim.tbl_isempty(vim.lsp.get_active_clients({ buffer = bufnr })) then local err_cnt = get_count(0, [[Error]]) if err_cnt > 0 and _NgConfigValues.lsp.disply_diagnostic_qf then - if not diagnostic.set_loclist then - vim.notify('deprecated: please update nvim to 0.7+') - diagnostic.set_loclist(cfg) - else - cfg.namespaces = diagnostic.get_namespaces() - diagnostic.setloclist(cfg) - end + cfg.namespaces = diagnostic.get_namespaces() + diagnostic.setloclist(cfg) else vim.cmd('lclose') end @@ -565,6 +560,10 @@ function M.config(cfg) end cfg = vim.tbl_extend('keep', cfg, default_cfg) + if vim.diagnostic == nil then + vim.notify('deprecated: please update nvim to 0.7+') + return + end vim.diagnostic.config(cfg) end diff --git a/lua/navigator/lspclient/mapping.lua b/lua/navigator/lspclient/mapping.lua index 4665977..67c629f 100644 --- a/lua/navigator/lspclient/mapping.lua +++ b/lua/navigator/lspclient/mapping.lua @@ -399,7 +399,7 @@ function M.setup(attach_opts) buffer = attach_opts.bufnr, desc = 'diagnostic update', callback = function() - require('navigator.diagnostics').set_diag_loclist(attach_opts.bufnr) + require('navigator.diagnostics').setloclist(attach_opts.bufnr) end, })