Merge pull request #358 from vimpostor/diagsbufreload

Respect autoHighlightDiags when reloading a buffer

diff --git a/autoload/lsp/diag.vim b/autoload/lsp/diag.vim
index a17598abe6cd03d5ad1b5d3e5d6ef2b753eb666f..480d1ec723dcca10789498fd5f0602e3d74829b0 100644 (file)
--- a/autoload/lsp/diag.vim
+++ b/autoload/lsp/diag.vim
@@ -107,6 +107,7 @@ export def InitOnce()
 
   # ALE plugin support
   if opt.lspOptions.aleSupport
+    opt.lspOptions.autoHighlightDiags = false
     autocmd_add([
       {
        group: 'LspAleCmds',
@@ -215,6 +216,11 @@ enddef
 # Refresh the placed diagnostics in buffer "bnr"
 # This inline signs, inline props, and virtual text diagnostics
 export def DiagsRefresh(bnr: number, all: bool = false)
+  var lspOpts = opt.lspOptions
+  if !lspOpts.autoHighlightDiags
+    return
+  endif
+
   :silent! bnr->bufload()
 
   RemoveDiagVisualsForBuffer(bnr, all)
@@ -228,7 +234,6 @@ export def DiagsRefresh(bnr: number, all: bool = false)
   var diag_align: string = 'above'
   var diag_wrap: string = 'truncate'
   var diag_symbol: string = '┌─'
-  var lspOpts = opt.lspOptions
 
   if lspOpts.diagVirtualTextAlign == 'below'
     diag_align = 'below'
@@ -331,9 +336,6 @@ export def ProcessNewDiags(bnr: number)
   var lspOpts = opt.lspOptions
   if lspOpts.aleSupport
     SendAleDiags(bnr, -1)
-    return
-  elseif !lspOpts.autoHighlightDiags
-    return
   endif
 
   if bnr == -1 || !diagsMap->has_key(bnr)

diff --git a/test/clangd_tests.vim b/test/clangd_tests.vim
index 5e18f94e888cadbbb7db9d1277e91df23d9ba043..54c5adeb033f765161b41c840501bb1734ed6158 100644 (file)
--- a/test/clangd_tests.vim
+++ b/test/clangd_tests.vim
@@ -1343,7 +1343,7 @@ def g:Test_LspTagFunc()
   :exe "normal \<C-]>"
   assert_equal([11, 6], [line('.'), col('.')])
   cursor(1, 1)
-  assert_fails('exe "normal \<C-]>"', 'E433: No tags file')
+  assert_fails('exe "normal \<C-]>"', 'E433:')
 
   :set tagfunc&
   :%bw!