Add some functions for sending LSP commands to a process, and automatically starting that process

2 files changed, 118 insertions, 29 deletions

diff --git a/autoload/ale/job.vim b/autoload/ale/job.vim
index 379d3c3a..d0572f51 100644
--- a/autoload/ale/job.vim
+++ b/autoload/ale/job.vim
@@ -215,6 +215,15 @@ function! ale#job#Start(command, options) abort
     return l:job_id
 endfunction
 
+" Send raw data to the job.
+function! ale#job#SendRaw(job_id, string) abort
+    if has('nvim')
+        call jobsend(a:job_id, a:string)
+    else
+        call ch_sendraw(job_getchannel(s:job_map[a:job_id]), a:string)
+    endif
+endfunction
+
 " Given a job ID, return 1 if the job is currently running.
 " Invalid job IDs will be ignored.
 function! ale#job#IsRunning(job_id) abort
diff --git a/autoload/ale/lsp.vim b/autoload/ale/lsp.vim
index 72b94427..acf47408 100644
--- a/autoload/ale/lsp.vim
+++ b/autoload/ale/lsp.vim
@@ -1,9 +1,31 @@
 " Author: w0rp <devw0rp@gmail.com>
 " Description: Language Server Protocol client code
 
-let s:address_info_map = {}
+" A List of connections, used for tracking servers which have been connected
+" to, and programs which are run.
+let s:connections = []
 let g:ale_lsp_next_message_id = 1
 
+function! s:NewConnection() abort
+    " data: The message data received so far.
+    " callback_map: A mapping from connections to response callbacks.
+    " address: An address only set for server connections.
+    " executable: An executable only set for program connections.
+    " job: A job ID only set for running programs.
+    let l:conn = {
+    \   'data': '',
+    \   'callback_map': {},
+    \   'address': '',
+    \   'executable': '',
+    \   'job_id': -1,
+    \}
+
+    call add(s:connections, l:conn)
+
+    return l:conn
+endfunction
+
+
 function! ale#lsp#GetNextMessageID() abort
     " Use the current ID
     let l:id = g:ale_lsp_next_message_id
@@ -87,27 +109,42 @@ function! ale#lsp#ReadMessageData(data) abort
     return [l:remainder, l:response_list]
 endfunction
 
-function! s:HandleMessage(channel, message) abort
-    let l:channel_info = ch_info(a:channel)
-    let l:address = l:channel_info.hostname . ':' . l:channel_info.port
-    let l:info = s:address_info_map[l:address]
-    let l:info.data .= a:message
+function! ale#lsp#HandleMessage(conn, message) abort
+    let a:conn.data .= a:message
 
     " Parse the objects now if we can, and keep the remaining text.
-    let [l:info.data, l:response_list] = ale#lsp#ReadMessageData(l:info.data)
+    let [a:conn.data, l:response_list] = ale#lsp#ReadMessageData(a:conn.data)
 
     " Call our callbacks.
     for l:response in l:response_list
-        let l:callback = l:info.callback_map.pop(l:response.id)
+        let l:callback = a:conn.callback_map.pop(l:response.id)
         call ale#util#GetFunction(l:callback)(l:response)
     endfor
 endfunction
 
-" Send a message to the server.
+function! s:HandleChannelMessage(channel, message) abort
+    let l:info = ch_info(a:channel)
+    let l:address = l:info.hostname . l:info.address
+    let l:conn = filter(s:connections[:], 'v:val.address ==# l:address')[0]
+
+    call ale#lsp#HandleMessage(l:conn, a:message)
+endfunction
+
+function! s:HandleCommandMessage(job_id, message) abort
+    let l:conn = filter(s:connections[:], 'v:val.job_id == a:job_id')[0]
+
+    call ale#lsp#HandleMessage(l:conn, a:message)
+endfunction
+
+" Send a message to a server with a given executable, and a command for
+" running the executable.
+"
 " A callback can be registered to handle the response.
 " Notifications do not need to be handled.
-" (address, message, callback?)
-function! ale#lsp#SendMessage(address, message, ...) abort
+" (executable, command, message, callback?)
+"
+" Returns 1 when a message is sent, 0 otherwise.
+function! ale#lsp#SendMessageToProgram(executable, command, message, ...) abort
     if a:0 > 1
         throw 'Too many arguments!'
     endif
@@ -116,37 +153,80 @@ function! ale#lsp#SendMessage(address, message, ...) abort
         throw 'A callback must be set for messages which are not notifications!'
     endif
 
+    if !executable(a:executable)
+        return 0
+    endif
+
     let [l:id, l:data] = ale#lsp#CreateMessageData(a:message)
 
-    let l:info = get(s:address_info_map, a:address, {})
+    let l:matches = filter(s:connections[:], 'v:val.executable ==# a:executable')
 
-    if empty(l:info)
-        let l:info = {
-        \   'data': '',
-        \   'callback_map': {},
-        \}
-        let s:address_info_map[a:address] = l:info
+    if empty(l:matches)
+        " We haven't looked at this executable before.
+        " Create a new connection.
+        let l:conn = NewConnection()
     endif
 
-    " The ID is 0 when the message is a Notification, which is a JSON-RPC
-    " request for which the server must not return a response.
-    if l:id != 0
-        " Add the callback, which the server will respond to later.
-        let l:info.callback_map[l:id] = a:1
+    if !ale#job#IsRunning(l:conn.job_id)
+        let l:options = {'mode': 'raw', 'out_cb': 's:HandleCommandMessage'}
+        let l:job_id = ale#job#Start(ale#job#PrepareCommand(a:command), l:options)
+    endif
+
+    if l:job_id > 0
+        return 0
     endif
 
-    if !has_key(l:info, 'channel') || ch_status(l:info.channel) !=# 'open'
-        let l:info.channnel = ch_open(a:address, {
+    call ale#job#SendRaw(l:job_id, l:data)
+
+    let l:conn.job_id = l:job_id
+
+    return 1
+endfunction
+
+" Send a message to a server at a given address.
+" A callback can be registered to handle the response.
+" Notifications do not need to be handled.
+" (address, message, callback?)
+"
+" Returns 1 when a message is sent, 0 otherwise.
+function! ale#lsp#SendMessageToAddress(address, message, ...) abort
+    if a:0 > 1
+        throw 'Too many arguments!'
+    endif
+
+    if !a:message[0] && a:0 == 0
+        throw 'A callback must be set for messages which are not notifications!'
+    endif
+
+    let [l:id, l:data] = ale#lsp#CreateMessageData(a:message)
+
+    let l:matches = filter(s:connections[:], 'v:val.address ==# a:address')
+
+    if empty(l:matches)
+        " We haven't looked at this address before.
+        " Create a new connection.
+        let l:conn = NewConnection()
+    endif
+
+    if !has_key(l:conn, 'channel') || ch_status(l:conn.channel) !=# 'open'
+        let l:conn.channnel = ch_open(a:address, {
         \   'mode': 'raw',
         \   'waittime': 0,
-        \   'callback': 's:HandleMessage',
+        \   'callback': 's:HandleChannelMessage',
         \})
     endif
 
-    if ch_status(l:info.channnel) ==# 'fail'
-        throw 'Failed to open channel for: ' . a:address
+    " The ID is 0 when the message is a Notification, which is a JSON-RPC
+    " request for which the server must not return a response.
+    if l:id != 0
+        " Add the callback, which the server will respond to later.
+        let l:conn.callback_map[l:id] = a:1
+    endif
+
+    if ch_status(l:conn.channnel) ==# 'fail'
+        return 0
     endif
 
     " Send the message to the server
-    call ch_sendraw(l:info.channel, l:data)
+    call ch_sendraw(l:conn.channel, l:data)
 endfunction