Use one LSP connection per project

4 files changed, 43 insertions, 152 deletions

diff --git a/test/lsp/test_did_save_event.vader b/test/lsp/test_did_save_event.vader
index 428135fb..f8ff8f70 100644
--- a/test/lsp/test_did_save_event.vader
+++ b/test/lsp/test_did_save_event.vader
@@ -13,6 +13,7 @@ Before:
   let b:ale_enabled = 1
   let g:ale_lsp_next_message_id = 1
   let g:ale_run_synchronously = 1
+  let g:conn_id = v:null
   let g:message_list = []
 
   function! LanguageCallback() abort
@@ -34,26 +35,29 @@ Before:
   let g:ale_linters = {'foobar': ['dummy_linter']}
 
   function! ale#lsp_linter#StartLSP(buffer, linter) abort
-    let l:conn = ale#lsp#NewConnection({})
-    let l:conn.id = 347
-    let l:conn.open_documents = {a:buffer : -1}
+    let g:conn_id = ale#lsp#Register('executable', '/foo/bar', {})
+    call ale#lsp#MarkDocumentAsOpen(g:conn_id, a:buffer)
 
     return {
     \ 'buffer': a:buffer,
-    \ 'connection_id': 347,
+    \ 'connection_id': g:conn_id,
     \ 'project_root': '/foo/bar',
     \ 'language_id': 'foobar',
     \}
   endfunction
 
   " Replace the Send function for LSP, so we can monitor calls to it.
-  function! ale#lsp#Send(conn_id, message, ...) abort
+  function! ale#lsp#Send(conn_id, message) abort
     call add(g:message_list, a:message)
   endfunction
 
 After:
   Restore
 
+  if g:conn_id isnot v:null
+    call ale#lsp#RemoveConnectionWithID(g:conn_id)
+  endif
+
   unlet! b:ale_enabled
   unlet! b:ale_linters
   unlet! g:message_list
@@ -61,7 +65,6 @@ After:
   delfunction LanguageCallback
   delfunction ProjectRootCallback
 
-  call ale#lsp#RemoveConnectionWithID(347)
   call ale#test#RestoreDirectory()
   call ale#linter#Reset()
 
diff --git a/test/lsp/test_lsp_command_formatting.vader b/test/lsp/test_lsp_command_formatting.vader
index 9d2c84ee..9721f37f 100644
--- a/test/lsp/test_lsp_command_formatting.vader
+++ b/test/lsp/test_lsp_command_formatting.vader
@@ -5,7 +5,7 @@ Before:
 
   " Mock the StartProgram function so we can just capture the arguments.
   function! ale#lsp#StartProgram(...) abort
-    let g:args = a:000
+    let g:args = a:000[1:]
   endfunction
 
 After:
@@ -27,10 +27,10 @@ Execute(Command formatting should be applied correctly for LSP linters):
 
   if has('win32')
     AssertEqual
-    \ ['cmd', 'cmd /s/c "cmd --foo"', {}],
+    \ ['cmd', 'cmd /s/c "cmd --foo"'],
     \ g:args
   else
     AssertEqual
-    \ ['true', [&shell, '-c', '''true'' --foo'], {}],
+    \ ['true', [&shell, '-c', '''true'' --foo']],
     \ g:args
   endif
diff --git a/test/lsp/test_lsp_connections.vader b/test/lsp/test_lsp_connections.vader
index ae64eadb..1c2fceab 100644
--- a/test/lsp/test_lsp_connections.vader
+++ b/test/lsp/test_lsp_connections.vader
@@ -225,57 +225,3 @@ Execute(ale#lsp#ReadMessageData() should handle a message with part of a second
   \   . '{"id":2,"jsonrpc":"2.0","result":{"foo":"barÜ"}}'
   \   . b:data
   \ )
-
-Execute(Projects with regular project roots should be registered correctly):
-  let b:conn = ale#lsp#NewConnection({})
-  call ale#lsp#RegisterProject(b:conn.id, '/foo/bar')
-
-  AssertEqual
-  \ {
-  \   '/foo/bar': {
-  \     'root': '/foo/bar',
-  \     'initialized': 0,
-  \     'message_queue': [],
-  \     'capabilities_queue': [],
-  \     'init_request_id': 0,
-  \   },
-  \ },
-  \ b:conn.projects
-
-Execute(Projects with regular project roots should be fetched correctly):
-  let b:conn = {
-  \ 'projects': {
-  \   '/foo/bar': {'initialized': 0, 'message_queue': [], 'init_request_id': 0},
-  \ },
-  \}
-
-  AssertEqual
-  \ {'initialized': 0, 'message_queue': [], 'init_request_id': 0},
-  \ ale#lsp#GetProject(b:conn, '/foo/bar')
-
-Execute(Projects with empty project roots should be registered correctly):
-  let b:conn = ale#lsp#NewConnection({})
-  call ale#lsp#RegisterProject(b:conn.id, '')
-
-  AssertEqual
-  \ {
-  \   '<<EMPTY>>': {
-  \     'root': '',
-  \     'initialized': 1,
-  \     'message_queue': [],
-  \     'capabilities_queue': [],
-  \     'init_request_id': 0,
-  \   },
-  \ },
-  \ b:conn.projects
-
-Execute(Projects with empty project roots should be fetched correctly):
-  let b:conn = {
-  \ 'projects': {
-  \   '<<EMPTY>>': {'initialized': 1, 'message_queue': [], 'init_request_id': 0},
-  \ },
-  \}
-
-  AssertEqual
-  \ {'initialized': 1, 'message_queue': [], 'init_request_id': 0},
-  \ ale#lsp#GetProject(b:conn, '')
diff --git a/test/lsp/test_other_initialize_message_handling.vader b/test/lsp/test_other_initialize_message_handling.vader
index f5e0f1da..e29f3358 100644
--- a/test/lsp/test_other_initialize_message_handling.vader
+++ b/test/lsp/test_other_initialize_message_handling.vader
@@ -1,15 +1,15 @@
 Before:
-  let b:project = {
+  let b:conn = {
+  \ 'is_tsserver': 0,
+  \ 'data': '',
+  \ 'root': '/foo/bar',
+  \ 'open_documents': {},
   \ 'initialized': 0,
-  \ 'init_request_id': 3,
+  \ 'init_request_id': 0,
+  \ 'init_options': {},
+  \ 'callback_list': [],
   \ 'message_queue': [],
   \ 'capabilities_queue': [],
-  \}
-
-  let b:conn = {
-  \ 'projects': {
-  \   '/foo/bar': b:project,
-  \ },
   \ 'capabilities': {
   \   'hover': 0,
   \   'references': 0,
@@ -20,64 +20,26 @@ Before:
   \}
 
 After:
-  unlet! b:project
   unlet! b:conn
 
-Execute(publishDiagnostics messages with files inside project directories should initialize projects):
-  " This is for some other file, ignore this one.
-  call ale#lsp#HandleOtherInitializeResponses(b:conn, {
-  \ 'method': 'textDocument/publishDiagnostics',
-  \ 'params': {'uri': 'file:///xyz/bar/baz.txt'},
-  \})
-
-  AssertEqual
-  \ {
-  \   'initialized': 0,
-  \   'init_request_id': 3,
-  \   'message_queue': [],
-  \   'capabilities_queue': [],
-  \ },
-  \ b:project
-
-  call ale#lsp#HandleOtherInitializeResponses(b:conn, {
-  \ 'method': 'textDocument/publishDiagnostics',
-  \ 'params': {'uri': 'file:///foo/bar/baz.txt'},
-  \})
-
-  AssertEqual
-  \ {
-  \   'initialized': 1,
-  \   'init_request_id': 3,
-  \   'message_queue': [],
-  \   'capabilities_queue': [],
-  \ },
-  \ b:project
-
 Execute(Messages with no method and capabilities should initialize projects):
-  call ale#lsp#HandleOtherInitializeResponses(b:conn, {
+  call ale#lsp#HandleInitResponse(b:conn, {
   \ 'result': {'capabilities': {}},
   \})
 
-  AssertEqual
-  \ {
-  \   'initialized': 1,
-  \   'init_request_id': 3,
-  \   'message_queue': [],
-  \   'capabilities_queue': [],
-  \ },
-  \ b:project
+  AssertEqual 1, b:conn.initialized
 
 Execute(Other messages should not initialize projects):
-  call ale#lsp#HandleOtherInitializeResponses(b:conn, {'method': 'lolwat'})
+  call ale#lsp#HandleInitResponse(b:conn, {'method': 'lolwat'})
 
-  AssertEqual 0, b:project.initialized
+  AssertEqual 0, b:conn.initialized
 
-  call ale#lsp#HandleOtherInitializeResponses(b:conn, {'result': {'x': {}}})
+  call ale#lsp#HandleInitResponse(b:conn, {'result': {'x': {}}})
 
-  AssertEqual 0, b:project.initialized
+  AssertEqual 0, b:conn.initialized
 
 Execute(Capabilities should bet set up correctly):
-  call ale#lsp#HandleOtherInitializeResponses(b:conn, {
+  call ale#lsp#HandleInitResponse(b:conn, {
   \ 'jsonrpc': '2.0',
   \ 'id': 1,
   \ 'result': {
@@ -110,29 +72,19 @@ Execute(Capabilities should bet set up correctly):
   \ },
   \})
 
+  AssertEqual 1, b:conn.initialized
   AssertEqual
   \ {
-  \   'capabilities': {
-  \     'completion_trigger_characters': ['.'],
-  \     'completion': 1,
-  \     'references': 1,
-  \     'hover': 1,
-  \     'definition': 1,
-  \   },
-  \   'message_queue': [],
-  \   'projects': {
-  \     '/foo/bar': {
-  \       'initialized': 1,
-  \       'message_queue': [],
-  \       'capabilities_queue': [],
-  \       'init_request_id': 3,
-  \     },
-  \   },
+  \   'completion_trigger_characters': ['.'],
+  \   'completion': 1,
+  \   'references': 1,
+  \   'hover': 1,
+  \   'definition': 1,
   \ },
-  \ b:conn
+  \ b:conn.capabilities
 
 Execute(Disabled capabilities should be recognised correctly):
-  call ale#lsp#HandleOtherInitializeResponses(b:conn, {
+  call ale#lsp#HandleInitResponse(b:conn, {
   \ 'jsonrpc': '2.0',
   \ 'id': 1,
   \ 'result': {
@@ -161,29 +113,19 @@ Execute(Disabled capabilities should be recognised correctly):
   \ },
   \})
 
+  AssertEqual 1, b:conn.initialized
   AssertEqual
   \ {
-  \   'capabilities': {
-  \     'completion_trigger_characters': [],
-  \     'completion': 0,
-  \     'references': 0,
-  \     'hover': 0,
-  \     'definition': 0,
-  \   },
-  \   'message_queue': [],
-  \   'projects': {
-  \     '/foo/bar': {
-  \       'initialized': 1,
-  \       'message_queue': [],
-  \       'capabilities_queue': [],
-  \       'init_request_id': 3,
-  \     },
-  \   },
+  \   'completion_trigger_characters': [],
+  \   'completion': 0,
+  \   'references': 0,
+  \   'hover': 0,
+  \   'definition': 0,
   \ },
-  \ b:conn
+  \ b:conn.capabilities
 
 Execute(Results that are not dictionaries should be handled correctly):
-  call ale#lsp#HandleOtherInitializeResponses(b:conn, {
+  call ale#lsp#HandleInitResponse(b:conn, {
   \ 'jsonrpc': '2.0',
   \ 'id': 1,
   \ 'result': v:null,