@ -1,11 +1,11 @@
local gui = require " navigator.gui " local gui = require " navigator.gui "
local diagnostic_list = { } local diagnostic_list = { }
local diagnostic = vim.diagnostic or vim.lsp . diagnostic
_NG_VT_NS = vim.api . nvim_create_namespace ( " navigator_lua " ) -- local hide = diagnostic.hide or diagnostic.clear
_NG_VT_DIAG_NS = vim.api . nvim_create_namespace ( " navigator_lua_diag " )
local util = require " navigator.util " local util = require " navigator.util "
local log = util.log local log = util.log
local trace = require " guihua.log " . trace local trace = require " guihua.log " . trace
-- trace = log
local error = util.error local error = util.error
local path_sep = require " navigator.util " . path_sep ( ) local path_sep = require " navigator.util " . path_sep ( )
@ -13,101 +13,160 @@ local mk_handler = require"navigator.util".mk_handler
local path_cur = require " navigator.util " . path_cur ( ) local path_cur = require " navigator.util " . path_cur ( )
diagnostic_list [ vim.bo . filetype ] = { } diagnostic_list [ vim.bo . filetype ] = { }
local function error_marker ( result , client_id ) local function clear_diag_VT ( bufnr ) -- important for clearing out when no more errors
if _NgConfigValues.lsp . diagnostic_scrollbar_sign == nil then -- not enabled or already shown
log ( bufnr , _NG_VT_DIAG_NS )
if bufnr == nil or _NG_VT_DIAG_NS == nil then
return
return
end
end
local first_line = vim.fn . line ( ' w0 ' )
-- local rootfolder = vim.fn.expand('%:h:t') -- get the current file root folder
trace ( result )
local bufnr = vim.uri_to_bufnr ( result.uri )
vim.api . nvim_buf_clear_namespace ( bufnr , _NG_VT_DIAG_NS , 0 , - 1 )
if bufnr ~= vim.api . nvim_get_current_buf ( ) then
_NG_VT_DIAG_NS = nil
-- log("not same buf", client_id, result.uri, bufnr, vim.fn.bufnr())
end
return
local function get_count ( bufnr , level )
if vim.diagnostic ~= nil then
return # diagnostic.get ( bufnr , { severity = level } )
else
return diagnostic.get_count ( bufnr , level )
end
end
trace ( result , bufnr )
end
if result == nil or result.diagnostics == nil or # result.diagnostics == 0 then
local function error_marker ( result , ctx , config )
local diag_cnt = vim.lsp . diagnostic.get_count ( bufnr , [[Error]] )
vim.defer_fn ( function ( )
+ vim.lsp . diagnostic.get_count ( bufnr , [[Warning]] )
if vim.tbl_isempty ( result.diagnostics ) then
if diag_cnt == 0 and _NG_VT_NS ~= nil then
return
vim.api . nvim_buf_clear_namespace ( bufnr , _NG_VT_NS , 0 , - 1 )
end
end
return
if _NgConfigValues.lsp . diagnostic_scrollbar_sign == nil then -- not enabled or already shown
end
return
end
local first_line = vim.fn . line ( ' w0 ' )
-- local rootfolder = vim.fn.expand('%:h:t') -- get the current file root folder
-- total line num of current buffer
local bufnr = ctx.bufnr
if bufnr == nil then
bufnr = vim.uri_to_bufnr ( result.uri )
end
local fname = vim.api . nvim_buf_get_name ( bufnr )
local uri = vim.uri_from_fname ( fname )
if uri ~= result.uri then
log ( " not same buf " , ctx , result.uri , bufnr , vim.fn . bufnr ( ) )
return
end
-- local winid = vim.fn.win_getid(vim.fn.winnr())
if not vim.api . nvim_buf_is_loaded ( bufnr ) then
-- local winid = vim.api.nvim_get_current_win()
log ( " buf not loaded " )
bufnr = vim.api . nvim_get_current_buf ( )
return
local total_num = vim.fn . getbufinfo ( bufnr ) [ 1 ] . linecount
-- local total_num = vim.fn.getbufinfo(vim.fn.winbufnr(winid))[1].linecount
-- window size of current buffer
local stats = vim.api . nvim_list_uis ( ) [ 1 ]
end
local wwidth = stats.width ;
local wheight = stats.height ;
-- local wwidth = vim.fn.winwidth(winid)
trace ( ' schedule callback ' , result , ctx , config )
-- local wheight = vim.fn.winheight(winid)
-- trace(result, bufnr)
if total_num <= wheight then
return
end
if _NG_VT_NS == nil then
_NG_VT_NS = vim.api . nvim_create_namespace ( " navigator_lua " )
end
vim.api . nvim_buf_clear_namespace ( 0 , _NG_VT_NS , 0 , - 1 )
if result == nil or result.diagnostics == nil or # result.diagnostics == 0 then
if total_num <= wheight then
local diag_cnt = get_count ( bufnr , [[Error]] ) + get_count ( bufnr , [[Warning]] )
first_line = 0
if diag_cnt == 0 and _NG_VT_DIAG_NS ~= nil then
end
log ( " great no errors " )
local pos = { }
vim.api . nvim_buf_clear_namespace ( bufnr , _NG_VT_DIAG_NS , 0 , - 1 )
-- pos of virtual text
for _ , diag in pairs ( result.diagnostics ) do
if diag.range and diag.range . start and diag.range . start.line then
local p = diag.range . start.line
p = util.round ( p * wheight / math.max ( wheight , total_num ) )
if pos [ # pos ] and pos [ # pos ] . line == p then
pos [ # pos ] = {
line = p ,
sign = _NgConfigValues.lsp . diagnostic_scrollbar_sign [ 2 ] ,
severity = diag.severity
}
else
table.insert ( pos , {
line = p ,
sign = _NgConfigValues.lsp . diagnostic_scrollbar_sign [ 1 ] ,
severity = diag.severity
} )
end
end
return
end
end
trace ( " pos " , pos , diag.range . start )
end
for i , s in pairs ( pos ) do
-- total line num of current buffer
local hl = ' ErrorMsg '
if s.severity > 1 then
-- local winid = vim.fn.win_getid(vim.fn.winnr())
hl = ' WarningMsg '
-- local winid = vim.api.nvim_get_current_win()
local total_num = vim.api . nvim_buf_line_count ( bufnr )
-- local total_num = vim.fn.getbufinfo(vim.fn.winbufnr(winid))[1].linecount
-- window size of current buffer
local stats = vim.api . nvim_list_uis ( ) [ 1 ]
-- local wwidth = stats.width;
local wheight = stats.height ;
if total_num <= wheight then
return
end
end
local l = s.line + first_line
if _NG_VT_DIAG_NS == nil then
if l > total_num then
_NG_VT_DIAG_NS = vim.api . nvim_create_namespace ( " navigator_lua_diag " )
l = total_num
end
end
vim.api . nvim_buf_set_extmark ( bufnr , _NG_VT_NS , l , - 1 ,
{ virt_text = { { s.sign , hl } } , virt_text_pos = ' right_align ' } )
local pos = { }
end
local diags = result.diagnostics
for i , _ in ipairs ( diags ) do
if not diags [ i ] . range then
diags [ i ] . range = { start = { line = diags [ i ] . lnum } }
end
end
table.sort ( diags , function ( a , b )
return a.range . start.line < b.range . start.line
end )
-- pos of virtual text
for _ , diag in pairs ( result.diagnostics ) do
local p
if not diag.range then
diag.range = { start = { line = diag.lnum } }
end
if diag.range and diag.range . start and diag.range . start.line then
p = diag.range . start.line
p = util.round ( p * wheight / math.max ( wheight , total_num ) )
if pos [ # pos ] and pos [ # pos ] . line == p then
local bar = ' ▆ '
if pos [ # pos ] == _NgConfigValues.lsp . diagnostic_scrollbar_sign [ 2 ] then
bar = ' █ '
end
pos [ # pos ] = { line = p , sign = bar , severity = math.min ( diag.severity , pos [ # pos ] . severity ) }
else
table.insert ( pos , {
line = p ,
sign = _NgConfigValues.lsp . diagnostic_scrollbar_sign [ 1 ] ,
severity = diag.severity
} )
end
end
trace ( " pos, line: " , p , diag.severity , diag.range )
end
if not vim.tbl_isempty ( pos ) then
vim.api . nvim_buf_clear_namespace ( bufnr , _NG_VT_DIAG_NS , 0 , - 1 )
end
for i , s in pairs ( pos ) do
local hl = ' ErrorMsg '
if s.severity == 2 then
hl = ' WarningMsg '
else
hl = ' DiagnosticInfo '
end
local l = s.line + first_line
if l > total_num then
l = total_num
end
trace ( " add pos " , s , bufnr )
vim.api . nvim_buf_set_extmark ( bufnr , _NG_VT_DIAG_NS , l , - 1 ,
{ virt_text = { { s.sign , hl } } , virt_text_pos = ' right_align ' } )
end
end , 10 ) -- defer in 10ms
end
local update_err_marker_async = function ( )
local debounce = require ' navigator.debounce ' . debounce_trailing
return debounce ( 20 , error_marker )
end end
local diag_hdlr = mk_handler ( function ( err , result , ctx , config ) local diag_hdlr = mk_handler ( function ( err , result , ctx , config )
trace ( result )
require " navigator.lspclient.highlight " . diagnositc_config_sign ( )
if err ~= nil then
if err ~= nil then
log ( err , config )
log ( err , config , result )
return
return
end
end
if vim.fn . mode ( ) ~= ' n ' and config.update_in_insert == false then
local mode = vim.api . nvim_get_mode ( ) . mode
if mode ~= ' n ' and config.update_in_insert == false then
log ( " skip in insert mode " )
log ( " skip in insert mode " )
return
return
end
end
@ -116,23 +175,26 @@ local diag_hdlr = mk_handler(function(err, result, ctx, config)
if diagnostic_list [ ft ] == nil then
if diagnostic_list [ ft ] == nil then
diagnostic_list [ vim.bo . filetype ] = { }
diagnostic_list [ vim.bo . filetype ] = { }
end
end
-- vim.lsp.diagnostic.clear(vim.fn.bufnr(), client.id, nil, nil)
local client_id = ctx.client_id
-- not sure if I should do this hack
if vim.tbl_isempty ( result.diagnostics ) then
if vim.api . nvim_buf_is_loaded ( ctx.bufnr ) then
-- diagnostic.reset(ctx.client_id)
-- clear_diag_VT(ctx.bufnr)
end
return
end
if util.nvim_0_6 ( ) then
if util.nvim_0_6 ( ) then
trace ( err , result , ctx , config )
vim.lsp . diagnostic.on_publish_diagnostics ( err , result , ctx , config )
vim.lsp . diagnostic.on_publish_diagnostics ( err , result , ctx , config )
else
else
log ( " old version of lsp nvim 050 " )
log ( " old version of lsp nvim 050 " )
vim.lsp . diagnostic.on_publish_diagnostics ( err , _ , result , ctx.client_id , _ , config )
vim.lsp . diagnostic.on_publish_diagnostics ( err , _ , result , ctx.client_id , _ , config )
end
end
local uri = result.uri
local uri = result.uri
if err then
-- trace("diag: ", mode, result, ctx, config)
log ( " diag " , err , result )
return
end
if vim.fn . mode ( ) ~= ' n ' and config.update_in_insert == false then
log ( " skip in insert mode " )
return
end
trace ( " diag: " , vim.fn . mode ( ) , result , ctx , config )
if result and result.diagnostics then
if result and result.diagnostics then
local item_list = { }
local item_list = { }
for _ , v in ipairs ( result.diagnostics ) do
for _ , v in ipairs ( result.diagnostics ) do
@ -155,6 +217,7 @@ local diag_hdlr = mk_handler(function(err, result, ctx, config)
local bufnr1 = vim.uri_to_bufnr ( uri )
local bufnr1 = vim.uri_to_bufnr ( uri )
if not vim.api . nvim_buf_is_loaded ( bufnr1 ) then
if not vim.api . nvim_buf_is_loaded ( bufnr1 ) then
if _NgConfigValues.diagnostic_load_files then
if _NgConfigValues.diagnostic_load_files then
-- print('load buffers')
vim.fn . bufload ( bufnr1 ) -- this may slow down the neovim
vim.fn . bufload ( bufnr1 ) -- this may slow down the neovim
local pos = v.range . start
local pos = v.range . start
local row = pos.line
local row = pos.line
@ -178,10 +241,12 @@ local diag_hdlr = mk_handler(function(err, result, ctx, config)
result.uri = uri
result.uri = uri
end
end
error_marker ( result , ctx.client_id )
local marker = update_err_marker_async ( )
marker ( result , ctx , config )
else
else
vim.api . nvim_buf_clear_namespace ( 0 , _NG_VT_NS , 0 , - 1 )
trace ( " great, no diag errors " )
_NG_VT_NS = nil
vim.api . nvim_buf_clear_namespace ( 0 , _NG_VT_DIAG_NS , 0 , - 1 )
_NG_VT_DIAG_NS = nil
end
end
end ) end )
@ -196,9 +261,7 @@ local diagnostic_cfg = {
-- and on, using buffer local variables
-- and on, using buffer local variables
signs = true ,
signs = true ,
update_in_insert = _NgConfigValues.lsp . diagnostic_update_in_insert or false ,
update_in_insert = _NgConfigValues.lsp . diagnostic_update_in_insert or false ,
severity_sort = function ( a , b )
severity_sort = { reverse = true }
return a.severity < b.severity
end
} }
if _NgConfigValues.lsp . diagnostic_virtual_text == false then if _NgConfigValues.lsp . diagnostic_virtual_text == false then
@ -209,24 +272,13 @@ end
M.diagnostic_handler = vim.lsp . with ( diag_hdlr , diagnostic_cfg ) M.diagnostic_handler = vim.lsp . with ( diag_hdlr , diagnostic_cfg )
M.hide_diagnostic = function ( ) M.hide_diagnostic = function ( )
if _NG_VT_ NS then
if _NG_VT_ DIAG_ NS then
vim.api . nvim_buf_clear_namespace ( 0 , _NG_VT_ NS, 0 , - 1 )
vim.api . nvim_buf_clear_namespace ( 0 , _NG_VT_ DIAG_ NS, 0 , - 1 )
_NG_VT_ NS = nil
_NG_VT_ DIAG_ NS = nil
end
end
end end
M.show_diagnostic = function ( ) M.show_diagnostic = function ( )
vim.lsp . diagnostic.get_all ( )
local bufs = vim.api . nvim_list_bufs ( )
for _ , buf in ipairs ( bufs ) do
local bname = vim.fn . bufname ( buf )
if # bname > 0 and not util.exclude ( bname ) then
if vim.api . nvim_buf_is_loaded ( buf ) then
vim.lsp . diagnostic.get ( buf , nil )
end
end
end
if diagnostic_list [ vim.bo . filetype ] ~= nil then
if diagnostic_list [ vim.bo . filetype ] ~= nil then
-- log(diagnostic_list[vim.bo.filetype])
-- log(diagnostic_list[vim.bo.filetype])
-- vim.fn.setqflist({}, " ", {title = "LSP", items = diagnostic_list[vim.bo.filetype]})
-- vim.fn.setqflist({}, " ", {title = "LSP", items = diagnostic_list[vim.bo.filetype]})
@ -239,56 +291,81 @@ M.show_diagnostic = function()
end
end
-- log(display_items)
-- log(display_items)
if # display_items > 0 then
if # display_items > 0 then
gui.new_list_view ( {
local listview = gui.new_list_view ( {
items = display_items ,
items = display_items ,
api = _NgConfigValues.icons . diagnostic_file .. _NgConfigValues.icons . diagnostic_head
api = _NgConfigValues.icons . diagnostic_file .. _NgConfigValues.icons . diagnostic_head
.. " Diagnostic " ,
.. " Diagnostic " ,
enable_preview_edit = true
enable_preview_edit = true
} )
} )
trace ( " new buffer " , listview.bufnr )
vim.api . nvim_buf_add_highlight ( listview.bufnr , - 1 , ' Title ' , 0 , 0 , - 1 )
end
end
end
end
end end
-- set quickfix win-- set loc list win
M.set_diag_loclist = function ( ) M.set_diag_loclist = function ( )
local bufnr = vim.api . nvim_get_current_buf ( )
local diag_cnt = get_count ( bufnr , [[Error]] ) + get_count ( bufnr , [[Warning]] )
if diag_cnt == 0 then
log ( " great, no errors! " )
return
end
local clients = vim.lsp . buf_get_clients ( 0 )
local cfg = { open = diag_cnt > 0 }
for _ , client in pairs ( clients ) do
cfg.client_id = client [ ' id ' ]
break
end
if not vim.tbl_isempty ( vim.lsp . buf_get_clients ( 0 ) ) then
if not vim.tbl_isempty ( vim.lsp . buf_get_clients ( 0 ) ) then
local err_cnt = vim.lsp . diagnostic.get_count ( 0 , [[Error]] )
local err_cnt = ( 0 , [[Error]] )
if err_cnt > 0 and _NgConfigValues.lsp . disply_diagnostic_qf then
if err_cnt > 0 and _NgConfigValues.lsp . disply_diagnostic_qf then
vim.lsp . diagnostic.set_loclist ( )
if diagnostic.set_loclist then
diagnostic.set_loclist ( cfg )
else
cfg.namespaces = diagnostic.get_namespace ( nil )
diagnostic.setloclist ( cfg )
end
else
else
vim.cmd ( " lclose " )
vim.cmd ( " lclose " )
end
end
end
end
end end
local function clear_diag_VT ( ) -- important for clearing out when no more errors
vim.api . nvim_buf_clear_namespace ( 0 , _NG_VT_NS , 0 , - 1 )
_NG_VT_NS = nil
end
-- TODO: callback when scroll -- TODO: callback when scroll
function M . update_err_marker ( ) function M . update_err_marker ( )
if _NG_VT_NS == nil then
trace ( " update err marker " , _NG_VT_DIAG_NS )
if _NG_VT_DIAG_NS == nil then
-- nothing to update
-- nothing to update
return
return
end
end
local bufnr = vim.api . nvim_get_current_buf ( )
local bufnr = vim.api . nvim_get_current_buf ( )
local diag_cnt = vim.lsp . diagnostic.get_count ( bufnr , [[Error]] )
local diag_cnt = get_count ( bufnr , [[Error]] ) + get_count ( bufnr , [[Warning]] )
+ vim.lsp . diagnostic.get_count ( bufnr , [[Warning]] )
+ get_count ( bufnr , [[Info]] ) + get_count ( bufnr , [[Hint]] )
if diag_cnt == 0 and _NG_VT_NS ~= nil then
vim.api . nvim_buf_clear_namespace ( bufnr , _NG_VT_NS , 0 , - 1 )
-- redraw
if diag_cnt == 0 and _NG_VT_DIAG_NS ~= nil then
vim.api . nvim_buf_clear_namespace ( bufnr , _NG_VT_DIAG_NS , 0 , - 1 )
trace ( " no errors " )
return
return
end
end
-- redraw
vim.api . nvim_buf_clear_namespace ( bufnr , _NG_VT_DIAG_NS , 0 , - 1 )
vim.api . nvim_buf_clear_namespace ( 0 , _NG_VT_NS , 0 , - 1 )
local errors = diagnostic.get ( bufnr )
local errors = vim.lsp . diagnostic.get ( bufnr )
if # errors == 0 then
if # errors == 0 then
trace ( " errors " , errors )
return
return
end
end
local result = { diagnostics = errors , uri = errors [ 1 ] . uri }
local uri = vim.uri_from_bufnr ( bufnr )
error_marker ( result )
local result = { diagnostics = errors , uri = errors [ 1 ] . uri or uri }
trace ( result )
local marker = update_err_marker_async ( )
marker ( result , { bufnr = bufnr , method = ' textDocument/publishDiagnostics ' } )
end end
-- TODO: update the marker -- TODO: update the marker
@ -300,4 +377,14 @@ if _NgConfigValues.lsp.diagnostic_scrollbar_sign then
vim.cmd [[autocmd WinScrolled * lua require'navigator.diagnostics'.update_err_marker()]]
vim.cmd [[autocmd WinScrolled * lua require'navigator.diagnostics'.update_err_marker()]]
end end
function M . get_line_diagnostic ( )
local lnum = vim.api . nvim_win_get_cursor ( 0 ) [ 1 ] - 1
return diagnostic.get ( vim.api . nvim_get_current_buf ( ) , { lnum = lnum } )
end
function M . show_line_diagnostics ( )
local lnum = vim.api . nvim_win_get_cursor ( 0 ) [ 1 ] - 1
diagnostic.show_line_diagnostics ( { border = ' single ' } , vim.api . nvim_get_current_buf ( ) , lnum )
end
return M return M
rayx
3 years ago
committed by
GitHub