From 1828e59e0f02be94e6e7f745bb1d666be14add93 Mon Sep 17 00:00:00 2001 From: Prabir Shrestha Date: Fri, 1 Jan 2021 04:36:57 +0000 Subject: [PATCH] temp --- autoload/lsp.vim | 5 +++++ autoload/lsp/internal/diagnostics/state.vim | 1 + autoload/lsp/internal/document_formatting.vim | 1 + autoload/lsp/ui/vim/diagnostics.vim | 5 +++++ test/testproject-rust/src/main.rs | 1 - 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/autoload/lsp.vim b/autoload/lsp.vim index 26bc460b0..d85cee27f 100644 --- a/autoload/lsp.vim +++ b/autoload/lsp.vim @@ -787,6 +787,10 @@ function! s:on_notification(server_name, id, data, event) abort if lsp#client#is_server_instantiated_notification(a:data) if has_key(l:response, 'method') + if a:data['response']['method'] ==# 'textDocument/publishDiagnostics' + echom json_encode(['old', a:data['response']]) + call lsp#log('pubdiag', a:data['response']) + endif if g:lsp_diagnostics_enabled && l:lsp_diagnostics_config_enabled && l:response['method'] ==# 'textDocument/publishDiagnostics' call lsp#ui#vim#diagnostics#handle_text_document_publish_diagnostics(a:server_name, a:data) elseif l:response['method'] ==# 'textDocument/semanticHighlighting' @@ -981,6 +985,7 @@ function! lsp#stream(...) abort if a:0 == 0 return lsp#callbag#share(s:Stream) else + call lsp#log('streamv', a:1, a:2) call s:Stream(a:1, a:2) endif endfunction diff --git a/autoload/lsp/internal/diagnostics/state.vim b/autoload/lsp/internal/diagnostics/state.vim index 06a1d6b9d..bfaad59a4 100644 --- a/autoload/lsp/internal/diagnostics/state.vim +++ b/autoload/lsp/internal/diagnostics/state.vim @@ -89,6 +89,7 @@ function! lsp#internal#diagnostics#state#_get_all_diagnostics_grouped_by_uri_and endfunction function! s:on_text_documentation_publish_diagnostics(server, response) abort + echom json_encode(['new', a:response]) if lsp#client#is_error(a:response) | return | endif let l:normalized_uri = lsp#utils#normalize_uri(a:response['params']['uri']) if !has_key(s:diagnostics_state, l:normalized_uri) diff --git a/autoload/lsp/internal/document_formatting.vim b/autoload/lsp/internal/document_formatting.vim index 6dfe03c2b..338af9569 100644 --- a/autoload/lsp/internal/document_formatting.vim +++ b/autoload/lsp/internal/document_formatting.vim @@ -50,6 +50,7 @@ function! lsp#internal#document_formatting#format(options) abort \ )), \ lsp#callbag#toList(), \ ).wait({ 'sleep': get(a:options, 'sleep', 1), 'timeout': get(a:options, 'timeout', g:lsp_format_sync_timeout) }) + echom json_encode(['xformat', l:x]) call s:format_next(l:x[0]) call s:format_complete() catch diff --git a/autoload/lsp/ui/vim/diagnostics.vim b/autoload/lsp/ui/vim/diagnostics.vim index eb49a993b..862cc6c9e 100644 --- a/autoload/lsp/ui/vim/diagnostics.vim +++ b/autoload/lsp/ui/vim/diagnostics.vim @@ -5,6 +5,7 @@ function! lsp#ui#vim#diagnostics#handle_text_document_publish_diagnostics(server if lsp#client#is_error(a:data['response']) return endif + echom json_encode(['old', a:data['response']]) let l:uri = a:data['response']['params']['uri'] let l:uri = lsp#utils#normalize_uri(l:uri) if !has_key(s:diagnostics, l:uri) @@ -220,6 +221,10 @@ function! s:get_diagnostics(uri) abort return [0, {}] endfunction +function! lsp#ui#vim#diagnostics#get_all() abort + return s:get_all_buffer_diagnostics() +endfunction + " Get diagnostics for the current buffer URI from all servers function! s:get_all_buffer_diagnostics(...) abort let l:target_server_name = get(a:000, 0, '') diff --git a/test/testproject-rust/src/main.rs b/test/testproject-rust/src/main.rs index 7a8622df9..3b4fbcd69 100644 --- a/test/testproject-rust/src/main.rs +++ b/test/testproject-rust/src/main.rs @@ -1,6 +1,5 @@ mod calc; -mod documentdefinition; mod documentformat; fn main() {