refactor diagnostics count to using diagnostics state (#999)

Author: prabirshrestha

autoload/lsp.vim

@@ -1120,7 +1120,7 @@ endfunction
 " Return dict with diagnostic counts for current buffer
 " { 'error': 1, 'warning': 0, 'information': 0, 'hint': 0 }
 function! lsp#get_buffer_diagnostics_counts() abort
-    return lsp#ui#vim#diagnostics#get_buffer_diagnostics_counts()
+    return lsp#internal#diagnostics#state#_get_diagnostics_count_for_buffer(bufnr('%'))
 endfunction
 
 " Return first error line or v:null if there are no errors

autoload/lsp/internal/diagnostics/state.vim

@@ -23,6 +23,13 @@ let s:diagnostics_state = {}
 " internal state for whether it is enabled or not to avoid multiple subscriptions
 let s:enabled = 0
 
+let s:diagnostic_kinds = {
+    \ 1: 'error',
+    \ 2: 'warning',
+    \ 3: 'information',
+    \ 4: 'hint',
+    \ }
+
 function! lsp#internal#diagnostics#state#_enable() abort
     " don't even bother registering if the feature is disabled
     if !g:lsp_diagnostics_enabled | return | endif
@@ -144,3 +151,24 @@ endfunction
 function! lsp#internal#diagnostics#state#_is_enabled_for_buffer(bufnr) abort
     return getbufvar(a:bufnr, 'lsp_diagnostics_enabled', 1) == 1
 endfunction
+
+" Return dict with diagnostic counts for the specified buffer
+" { 'error': 1, 'warning': 0, 'information': 0, 'hint': 0 }
+function! lsp#internal#diagnostics#state#_get_diagnostics_count_for_buffer(bufnr) abort
+    let l:counts = {
+        \ 'error': 0,
+        \ 'warning': 0,
+        \ 'information': 0,
+        \ 'hint': 0,
+        \ }
+    if lsp#internal#diagnostics#state#_is_enabled_for_buffer(a:bufnr)
+        let l:uri = lsp#utils#get_buffer_uri(a:bufnr)
+        for [l:_, l:response] in items(lsp#internal#diagnostics#state#_get_all_diagnostics_grouped_by_server_for_uri(l:uri))
+            for l:diagnostic in l:response['params']['diagnostics']
+                let l:key = get(s:diagnostic_kinds, get(l:diagnostic, 'severity', 1) , 'error')
+                let l:counts[l:key] += 1
+            endfor
+        endfor
+    end
+    return l:counts
+endfunction

autoload/lsp/ui/vim/diagnostics.vim

@@ -15,10 +15,6 @@ function! lsp#ui#vim#diagnostics#handle_text_document_publish_diagnostics(server
     doautocmd <nomodeline> User lsp_diagnostics_updated
 endfunction
 
-function! lsp#ui#vim#diagnostics#get_document_diagnostics(bufnr) abort
-    return get(s:diagnostics, lsp#utils#get_buffer_uri(a:bufnr), {})
-endfunction
-
 function! s:severity_of(diagnostic) abort
     return get(a:diagnostic, 'severity', 1)
 endfunction
@@ -213,31 +209,6 @@ function! s:compare_diagnostics(d1, d2) abort
     endif
 endfunction
 
-let s:diagnostic_kinds = {
-    \ 1: 'error',
-    \ 2: 'warning',
-    \ 3: 'information',
-    \ 4: 'hint',
-    \ }
-
-function! lsp#ui#vim#diagnostics#get_buffer_diagnostics_counts() abort
-    let l:counts = {
-        \ 'error': 0,
-        \ 'warning': 0,
-        \ 'information': 0,
-        \ 'hint': 0,
-        \ }
-    let l:uri = lsp#utils#get_buffer_uri()
-    let [l:has_diagnostics, l:diagnostics] = s:get_diagnostics(l:uri)
-    for [l:server_name, l:data] in items(l:diagnostics)
-        for l:diag in l:data['response']['params']['diagnostics']
-            let l:key = get(s:diagnostic_kinds, s:severity_of(l:diag), 'error')
-            let l:counts[l:key] += 1
-        endfor
-    endfor
-    return l:counts
-endfunction
-
 function! lsp#ui#vim#diagnostics#get_buffer_first_error_line() abort
     let l:uri = lsp#utils#get_buffer_uri()
     let [l:has_diagnostics, l:diagnostics] = s:get_diagnostics(l:uri)