chore: lsp diagnostics setup

This commit is contained in:
kiyan 2021-09-26 11:56:44 +02:00
parent 0ca87178b6
commit 1edebb7894
5 changed files with 20 additions and 14 deletions

View File

@ -51,6 +51,8 @@ require'nvim-tree'.setup {
hijack_cursor = false,
-- updates the root directory of the tree on `DirChanged` (when your run `:cd` usually)
update_cwd = false,
-- show lsp diagnostics in the signcolumn
lsp_diagnostics = false,
-- update the focused file on `BufEnter`, un-collapses the folders recursively until it finds the file
update_focused_file = {
-- enables the feature
@ -86,7 +88,6 @@ let g:nvim_tree_root_folder_modifier = ':~' "This is the default. See :help file
let g:nvim_tree_auto_resize = 0 "1 by default, will resize the tree to its saved width when opening a file
let g:nvim_tree_add_trailing = 1 "0 by default, append a trailing slash to folder names
let g:nvim_tree_group_empty = 1 " 0 by default, compact folders that only contain a single folder into one node in the file tree
let g:nvim_tree_lsp_diagnostics = 1 "0 by default, will show lsp diagnostics in the signcolumn. See :help nvim_tree_lsp_diagnostics
let g:nvim_tree_disable_window_picker = 1 "0 by default, will disable the window picker.
let g:nvim_tree_icon_padding = ' ' "one space by default, used for rendering the space between the icon and the filename. Use with caution, it could break rendering if you set an empty string depending on your font.
let g:nvim_tree_symlink_arrow = ' >> ' " defaults to ' ➛ '. used as a separator between symlinks' source and target.

View File

@ -74,6 +74,7 @@ function.
open_on_tab = false,
hijack_cursor = false,
update_cwd = false,
lsp_diagnostics = false,
update_focused_file = {
enable = false,
update_cwd = false,
@ -159,6 +160,10 @@ Here is a list of the options available in the setup call:
type: `{string}`
default: `{}`
- |lsp_diagnostics|: show lsp diagnostics in the signcolumn
type: `boolean`
default: false
==============================================================================
OPTIONS *nvim-tree-options*
@ -317,12 +322,6 @@ Can be 0 or 1. When 1, appends a trailing slash to folder names.
Can be 0 or 1. When 1, folders that contain only one folder are grouped
together. 0 by default.
|g:nvim_tree_lsp_diagnostics| *g:nvim_tree_lsp_diagnostics*
Can be 0 or 1. When 1, will show nvim-lsp diagnostics in the signcolumn
of the tree highlighted by diagnostic severity.
Code will be executed on `LspDiagnosticsChanged`. 0 by default.
|g:nvim_tree_special_files| *g:nvim_tree_special_files*
A list of filenames that gets highlighted with `NvimTreeSpecialFile`.

View File

@ -374,7 +374,7 @@ local function setup_autocommands(opts)
au SessionLoadPost * lua require'nvim-tree.view'._wipe_rogue_buffer()
]]
if vim.g.nvim_tree_lsp_diagnostics == 1 then
if opts.lsp_diagnostics then
vim.cmd "au User LspDiagnosticsChanged lua require'nvim-tree.diagnostics'.update()"
end
if opts.auto_close then
@ -404,6 +404,7 @@ local DEFAULT_OPTS = {
auto_close = false,
hijack_cursor = false,
update_cwd = false,
lsp_diagnostics = false,
update_focused_file = {
enable = false,
update_cwd = false,
@ -428,6 +429,7 @@ function M.setup(conf)
require'nvim-tree.colors'.setup()
require'nvim-tree.view'.setup()
require'nvim-tree.diagnostics'.setup(opts)
setup_autocommands(opts)
setup_vim_commands()
@ -448,6 +450,7 @@ local out_config = {
"nvim_tree_system_open_command_args",
"nvim_tree_follow",
"nvim_tree_follow_update_path",
"nvim_tree_lsp_diagnostics"
}
local x = vim.tbl_filter(function(v)

View File

@ -88,6 +88,9 @@ local function from_coc()
end
function M.update()
if not M.enable then
return
end
local buffer_severity
if vim.g.coc_service_initialized == 1 then
buffer_severity = from_coc()
@ -116,4 +119,8 @@ function M.update()
end
end
function M.setup(opts)
M.enable = opts.lsp_diagnostics
end
return M

View File

@ -146,9 +146,7 @@ function M.unroll_dir(node)
renderer.draw(M.Tree, true)
end
if vim.g.nvim_tree_lsp_diagnostics == 1 then
diagnostics.update()
end
diagnostics.update()
end
local function refresh_git(node)
@ -190,9 +188,7 @@ function M.refresh_tree(disable_clock)
end)
end
if vim.g.nvim_tree_lsp_diagnostics == 1 then
vim.schedule(diagnostics.update)
end
vim.schedule(diagnostics.update)
if view.win_open() then
renderer.draw(M.Tree, true)