refactor diagnostics under cursor to use the new internal diagnostics state (#997)

Author: prabirshrestha

autoload/lsp/internal/diagnostics/echo.vim

@@ -9,14 +9,14 @@ function! lsp#internal#diagnostics#echo#_enable() abort
     let s:enabled = 1
 
     let s:Dispose = lsp#callbag#pipe(
-        \ lsp#callbag#fromEvent('CursorMoved'),
+        \ lsp#callbag#fromEvent(['CursorMoved']),
         \ lsp#callbag#filter({_->g:lsp_diagnostics_echo_cursor}),
         \ lsp#callbag#debounceTime(g:lsp_diagnostics_echo_delay),
         \ lsp#callbag#map({_->{'bufnr': bufnr('%'), 'curpos': getcurpos()[0:2], 'changedtick': b:changedtick }}),
         \ lsp#callbag#distinctUntilChanged({a,b -> a['bufnr'] == b['bufnr'] && a['curpos'] == b['curpos'] && a['changedtick'] == b['changedtick']}),
         \ lsp#callbag#filter({_->mode() is# 'n'}),
         \ lsp#callbag#filter({_->getbufvar(bufnr('%'), '&buftype') !=# 'terminal' }),
-        \ lsp#callbag#map({_->lsp#ui#vim#diagnostics#get_diagnostics_under_cursor()}),
+        \ lsp#callbag#map({_->lsp#internal#diagnostics#under_cursor#get_diagnostic()}),
         \ lsp#callbag#subscribe({x->s:echo(x)}),
         \ )
 endfunction

autoload/lsp/internal/diagnostics/float.vim

@@ -17,7 +17,7 @@ function! lsp#internal#diagnostics#float#_enable() abort
         \ lsp#callbag#distinctUntilChanged({a,b -> a['bufnr'] == b['bufnr'] && a['curpos'] == b['curpos'] && a['changedtick'] == b['changedtick']}),
         \ lsp#callbag#filter({_->mode() is# 'n'}),
         \ lsp#callbag#filter({_->getbufvar(bufnr('%'), '&buftype') !=# 'terminal' }),
-        \ lsp#callbag#map({_->lsp#ui#vim#diagnostics#get_diagnostics_under_cursor()}),
+        \ lsp#callbag#map({_->lsp#internal#diagnostics#under_cursor#get_diagnostic()}),
         \ lsp#callbag#subscribe({x->s:show_float(x)}),
         \ )
 endfunction

autoload/lsp/internal/diagnostics/under_cursor.vim

@@ -0,0 +1,50 @@
+" Returns a diagnostic object, or empty dictionary if no diagnostics are
+" available.
+" options = {
+"   'server': '',        " optional
+" }
+function! lsp#internal#diagnostics#under_cursor#get_diagnostic() abort
+    let l:options = get(a:000, 0, {})
+    let l:server = get(l:options, 'server', '')
+    let l:bufnr = bufnr('%')
+
+    if !lsp#internal#diagnostics#state#_is_enabled_for_buffer(l:bufnr)
+        return {}
+    endif
+
+    let l:uri = lsp#utils#get_buffer_uri(l:bufnr)
+
+    let l:diagnostics_by_server = lsp#internal#diagnostics#state#_get_all_diagnostics_grouped_by_server_for_uri(l:uri)
+    if empty(l:server)
+        let l:diagnostics = []
+        for l:item in values(l:diagnostics_by_server)
+            let l:diagnostics += l:item['params']['diagnostics']
+        endfor
+    else
+        if has_key(l:diagnostics_by_server, l:server)
+            let l:diagnostics = l:diagnostics_by_server[l:server]['params']['diagnostics']
+        else
+            let l:diagnostics = []
+        endif
+    endif
+
+    let l:line = line('.')
+    let l:col = col('.')
+
+    let l:closest_diagnostic = {}
+    let l:closest_distance = -1
+
+    for l:diagnostic in l:diagnostics
+        let [l:start_line, l:start_col] = lsp#utils#position#lsp_to_vim('%', l:diagnostic['range']['start'])
+
+        if l:line == l:start_line
+            let l:distance = abs(l:start_col - l:col)
+            if l:closest_distance < 0 || l:distance < l:closest_distance
+                let l:closest_diagnostic = l:diagnostic
+                let l:closest_distance = l:distance
+            endif
+        endif
+    endfor
+
+    return l:closest_diagnostic
+endfunction

autoload/lsp/ui/vim/code_action.vim

@@ -39,7 +39,7 @@ function! lsp#ui#vim#code_action#do(option) abort
     let l:bufnr = bufnr('%')
     let l:command_id = lsp#_new_command()
     for l:server_name in l:server_names
-        let l:diagnostic = lsp#ui#vim#diagnostics#get_diagnostics_under_cursor(l:server_name)
+        let l:diagnostic = lsp#internal#diagnostics#under_cursor#get_diagnostic(l:server_name)
         call lsp#send_request(l:server_name, {
                     \ 'method': 'textDocument/codeAction',
                     \ 'params': {

autoload/lsp/ui/vim/diagnostics.vim

@@ -19,39 +19,6 @@ function! lsp#ui#vim#diagnostics#get_document_diagnostics(bufnr) abort
     return get(s:diagnostics, lsp#utils#get_buffer_uri(a:bufnr), {})
 endfunction
 
-" Returns a diagnostic object, or empty dictionary if no diagnostics are available.
-"
-" Note: Consider renaming this method (s/diagnostics/diagnostic) to make
-" it clear that it returns just one diagnostic, not a list.
-function! lsp#ui#vim#diagnostics#get_diagnostics_under_cursor(...) abort
-    let l:target_server_name = get(a:000, 0, '')
-
-    let l:diagnostics = s:get_all_buffer_diagnostics(l:target_server_name)
-    if !len(l:diagnostics)
-        return
-    endif
-
-    let l:line = line('.')
-    let l:col = col('.')
-
-    let l:closest_diagnostic = {}
-    let l:closest_distance = -1
-
-    for l:diagnostic in l:diagnostics
-        let [l:start_line, l:start_col] = lsp#utils#position#lsp_to_vim('%', l:diagnostic['range']['start'])
-
-        if l:line == l:start_line
-            let l:distance = abs(l:start_col - l:col)
-            if l:closest_distance < 0 || l:distance < l:closest_distance
-                let l:closest_diagnostic = l:diagnostic
-                let l:closest_distance = l:distance
-            endif
-        endif
-    endfor
-
-    return l:closest_diagnostic
-endfunction
-
 function! s:severity_of(diagnostic) abort
     return get(a:diagnostic, 'severity', 1)
 endfunction