vim/ale
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use lambdas for LSP message callbacks, which are easier to manage

Browse Source
This commit is contained in:
w0rp 2018-08-08 20:08:51 +01:00
parent 8faa11752c
commit fc94fd4deb
No known key found for this signature in database
GPG Key ID: 0FC1ECAA8C81CD83
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
autoload/ale/lsp.vim
View File

@ -300,19 +300,6 @@ function! ale#lsp#HandleMessage(conn, message) abort
endfor endfor
endfunction endfunction
function! s:HandleChannelMessage(channel_id, message) abort
let l:address = ale#socket#GetAddress(a:channel_id)
let l:conn = s:FindConnection('id', l:address)
call ale#lsp#HandleMessage(l:conn, a:message)
endfunction
function! s:HandleCommandMessage(job_id, message) abort
let l:conn = s:FindConnection('id', a:job_id)
call ale#lsp#HandleMessage(l:conn, a:message)
endfunction
" Given a connection ID, mark it as a tsserver connection, so it will be " Given a connection ID, mark it as a tsserver connection, so it will be
" handled that way. " handled that way.
function! ale#lsp#MarkConnectionAsTsserver(conn_id) abort function! ale#lsp#MarkConnectionAsTsserver(conn_id) abort
@ -373,7 +360,7 @@ function! ale#lsp#StartProgram(executable, command, init_options) abort
if !has_key(l:conn, 'id') || !ale#job#IsRunning(l:conn.id) if !has_key(l:conn, 'id') || !ale#job#IsRunning(l:conn.id)
let l:options = { let l:options = {
\ 'mode': 'raw', \ 'mode': 'raw',
\ 'out_cb': function('s:HandleCommandMessage'), \ 'out_cb': {_, message -> ale#lsp#HandleMessage(l:conn, message)},
\} \}
let l:job_id = ale#job#Start(a:command, l:options) let l:job_id = ale#job#Start(a:command, l:options)
else else
@ -397,7 +384,7 @@ function! ale#lsp#ConnectToAddress(address, init_options) abort
if !has_key(l:conn, 'channel_id') || !ale#socket#IsOpen(l:conn.channel_id) if !has_key(l:conn, 'channel_id') || !ale#socket#IsOpen(l:conn.channel_id)
let l:conn.channel_id = ale#socket#Open(a:address, { let l:conn.channel_id = ale#socket#Open(a:address, {
\ 'callback': function('s:HandleChannelMessage'), \ 'callback': {_, message -> ale#lsp#HandleMessage(l:conn, message)},
\}) \})
endif endif