Check LSP capabilities before using them

1 files changed, 43 insertions, 4 deletions

diff --git a/test/test_go_to_definition.vader b/test/test_go_to_definition.vader
index 749f4d7e..7f0e3fcb 100644
--- a/test/test_go_to_definition.vader
+++ b/test/test_go_to_definition.vader
@@ -3,17 +3,17 @@ Before:
   call ale#test#SetFilename('dummy.txt')
 
   let g:old_filename = expand('%:p')
-  let g:Callback = 0
+  let g:Callback = ''
   let g:message_list = []
   let g:expr_list = []
+  let g:capability_checked = ''
+  let g:WaitCallback = v:null
 
   runtime autoload/ale/linter.vim
   runtime autoload/ale/lsp.vim
   runtime autoload/ale/util.vim
 
-  function! ale#lsp_linter#StartLSP(buffer, linter, callback) abort
-    let g:Callback = a:callback
-
+  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}
@@ -26,6 +26,15 @@ Before:
     \}
   endfunction
 
+  function! ale#lsp#WaitForCapability(conn_id, project_root, capability, callback) abort
+    let g:capability_checked = a:capability
+    let g:WaitCallback = a:callback
+  endfunction
+
+  function! ale#lsp#RegisterCallback(conn_id, callback) abort
+    let g:Callback = a:callback
+  endfunction
+
   function! ale#lsp#Send(conn_id, message, root) abort
     call add(g:message_list, a:message)
 
@@ -42,6 +51,8 @@ After:
   call ale#test#RestoreDirectory()
   call ale#linter#Reset()
 
+  unlet! g:capability_checked
+  unlet! g:WaitCallback
   unlet! g:old_filename
   unlet! g:Callback
   unlet! g:message_list
@@ -137,6 +148,13 @@ Execute(tsserver completion requests should be sent):
 
   ALEGoToDefinition
 
+  " We shouldn't register the callback yet.
+  AssertEqual '''''', string(g:Callback)
+
+  AssertEqual type(function('type')), type(g:WaitCallback)
+  AssertEqual 'definition', g:capability_checked
+  call call(g:WaitCallback, [347, '/foo/bar'])
+
   AssertEqual
   \ 'function(''ale#definition#HandleTSServerResponse'')',
   \ string(g:Callback)
@@ -151,6 +169,13 @@ Execute(tsserver tab completion requests should be sent):
 
   ALEGoToDefinitionInTab
 
+  " We shouldn't register the callback yet.
+  AssertEqual '''''', string(g:Callback)
+
+  AssertEqual type(function('type')), type(g:WaitCallback)
+  AssertEqual 'definition', g:capability_checked
+  call call(g:WaitCallback, [347, '/foo/bar'])
+
   AssertEqual
   \ 'function(''ale#definition#HandleTSServerResponse'')',
   \ string(g:Callback)
@@ -276,6 +301,13 @@ Execute(LSP completion requests should be sent):
 
   ALEGoToDefinition
 
+  " We shouldn't register the callback yet.
+  AssertEqual '''''', string(g:Callback)
+
+  AssertEqual type(function('type')), type(g:WaitCallback)
+  AssertEqual 'definition', g:capability_checked
+  call call(g:WaitCallback, [347, '/foo/bar'])
+
   AssertEqual
   \ 'function(''ale#definition#HandleLSPResponse'')',
   \ string(g:Callback)
@@ -305,6 +337,13 @@ Execute(LSP tab completion requests should be sent):
 
   ALEGoToDefinitionInTab
 
+  " We shouldn't register the callback yet.
+  AssertEqual '''''', string(g:Callback)
+
+  AssertEqual type(function('type')), type(g:WaitCallback)
+  AssertEqual 'definition', g:capability_checked
+  call call(g:WaitCallback, [347, '/foo/bar'])
+
   AssertEqual
   \ 'function(''ale#definition#HandleLSPResponse'')',
   \ string(g:Callback)