Skip to content

Commit 51eb1f6

Browse files
add support for window/showMessageRequest (#919)
* show message request * materialize so doesn't throw error and add message to input list * fix lint issues and rename flag to lsp_show_message_request_enabled * use action and fix filter * document g:lsp_show_message_request_enabled
1 parent 860dcab commit 51eb1f6

File tree

4 files changed

+70
-1
lines changed

4 files changed

+70
-1
lines changed

autoload/lsp.vim

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ function! lsp#enable() abort
6666
call lsp#ui#vim#completion#_setup()
6767
call lsp#internal#diagnostics#_enable()
6868
call lsp#internal#highlight_references#_enable()
69+
call lsp#internal#show_message_request#_enable()
6970
call s:register_events()
7071
endfunction
7172

@@ -81,6 +82,7 @@ function! lsp#disable() abort
8182
call lsp#ui#vim#completion#_disable()
8283
call lsp#internal#diagnostics#_disable()
8384
call lsp#internal#highlight_references#_disable()
85+
call lsp#internal#show_message_request#_disable()
8486
call s:unregister_events()
8587
let s:enabled = 0
8688
endfunction
@@ -759,7 +761,7 @@ function! s:on_notification(server_name, id, data, event) abort
759761
endfunction
760762

761763
function! s:on_request(server_name, id, request) abort
762-
call lsp#log_verbose('<---', a:id, a:request)
764+
call lsp#log_verbose('<---', 's:on_request', a:id, a:request)
763765

764766
let l:stream_data = { 'server': a:server_name, 'request': a:request }
765767
call s:Stream(1, l:stream_data) " notify stream before callbacks
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
function! lsp#internal#show_message_request#_enable() abort
2+
if !g:lsp_show_message_request_enabled | return | endif
3+
let s:Dispose = lsp#callbag#pipe(
4+
\ lsp#stream(),
5+
\ lsp#callbag#filter({x->
6+
\ g:lsp_show_message_request_enabled &&
7+
\ has_key(x, 'request') && !has_key(x, 'response') &&
8+
\ has_key(x['request'], 'method') && x['request']['method'] ==# 'window/showMessageRequest'
9+
\ }),
10+
\ lsp#callbag#map({x->s:show_message_request(x['server'], x['request'])}),
11+
\ lsp#callbag#map({x->s:send_message_response(x['server'], x['request'], x['action'])}),
12+
\ lsp#callbag#flatten(),
13+
\ lsp#callbag#materialize(),
14+
\ lsp#callbag#subscribe({ 'error': function('s:on_error') }),
15+
\ )
16+
endfunction
17+
18+
function! lsp#internal#show_message_request#_disable() abort
19+
if exists('s:Dispose')
20+
call s:Dispose()
21+
unlet s:Dispose
22+
endif
23+
endfunction
24+
25+
function! s:on_error(e) abort
26+
call lsp#log('lsp#internal#show_message_request error', a:e)
27+
if exists('s:Dispose')
28+
call s:Dispose()
29+
unlet s:Dispose
30+
endif
31+
endfunction
32+
33+
function! s:show_message_request(server_name, request) abort
34+
let l:params = a:request['params']
35+
36+
let l:selected_action = v:null
37+
38+
if has_key(l:params, 'actions') && !empty(l:params['actions'])
39+
let l:options = map(copy(l:params['actions']), {i, action ->
40+
\ printf('%d - [%s] %s', i + 1, a:server_name, action['title'])
41+
\ })
42+
let l:index = inputlist([l:params['message']] + l:options)
43+
if l:index > 0 && l:index <= len(l:index)
44+
let l:selected_action = l:params['actions'][l:index - 1]
45+
endif
46+
else
47+
echom l:params['message']
48+
endif
49+
50+
return { 'server': a:server_name, 'request': a:request, 'action': l:selected_action }
51+
endfunction
52+
53+
function! s:send_message_response(server_name, request, action) abort
54+
return lsp#request(a:server_name, {
55+
\ 'id': a:request['id'],
56+
\ 'result': a:action
57+
\})
58+
endfunction

doc/vim-lsp.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ CONTENTS *vim-lsp-contents*
4848
g:lsp_snippet_expand |g:lsp_snippet_expand|
4949
g:lsp_completion_resolve_timeout |g:lsp_completion_resolve_timeout|
5050
g:lsp_tagfunc_source_methods |g:lsp_tagfunc_source_methods|
51+
g:lsp_show_message_request_enabled |g:lsp_show_message_request_enabled|
5152
Functions |vim-lsp-functions|
5253
lsp#enable |lsp#enable()|
5354
lsp#disable |lsp#disable()|
@@ -690,6 +691,13 @@ g:lsp_tagfunc_source_methods *g:lsp_tagfunc_source_methods*
690691
The LSP methods to call to get symbols for tag lookup. See
691692
|vim-lsp-tagfunc|.
692693

694+
g:lsp_show_message_request_enabled *g:lsp_show_message_request_enabled*
695+
Type: |Number|
696+
Default: `1`
697+
698+
Determines whether or not `window/showMessageRequest` should show message to
699+
the user or if it should be ignored. Set to `1` to enable.
700+
693701
==============================================================================
694702
FUNCTIONS *vim-lsp-functions*
695703

plugin/lsp.vim

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ let g:lsp_semantic_enabled = get(g:, 'lsp_semantic_enabled', 0)
4848
let g:lsp_text_document_did_save_delay = get(g:, 'lsp_text_document_did_save_delay', -1)
4949
let g:lsp_completion_resolve_timeout = get(g:, 'lsp_completion_resolve_timeout', 200)
5050
let g:lsp_tagfunc_source_methods = get(g:, 'lsp_tagfunc_source_methods', ['definition', 'declaration', 'implementation', 'typeDefinition'])
51+
let g:lsp_show_message_request_enabled = get(g:, 'lsp_show_message_request_enabled', 1)
5152

5253
let g:lsp_get_supported_capabilities = get(g:, 'lsp_get_supported_capabilities', [function('lsp#default_get_supported_capabilities')])
5354

0 commit comments

Comments
 (0)