From 9bdabce8dffa54791aff8c97f46d0f8ab5acbf24 Mon Sep 17 00:00:00 2001
From: w0rp <devw0rp@gmail.com>
Date: Fri, 7 Aug 2020 10:54:38 +0100
Subject: Fix #2907 - Handle dictionaries for capabilities

---
 autoload/ale/lsp.vim                               | 24 ++++++++++
 .../test_other_initialize_message_handling.vader   | 53 +++++++++++++++++++++-
 2 files changed, 76 insertions(+), 1 deletion(-)

diff --git a/autoload/ale/lsp.vim b/autoload/ale/lsp.vim
index 2509174e..ae8fd51d 100644
--- a/autoload/ale/lsp.vim
+++ b/autoload/ale/lsp.vim
@@ -196,14 +196,26 @@ function! s:UpdateCapabilities(conn, capabilities) abort
         let a:conn.capabilities.hover = 1
     endif
 
+    if type(get(a:capabilities, 'hoverProvider')) is v:t_dict
+        let a:conn.capabilities.hover = 1
+    endif
+
     if get(a:capabilities, 'referencesProvider') is v:true
         let a:conn.capabilities.references = 1
     endif
 
+    if type(get(a:capabilities, 'referencesProvider')) is v:t_dict
+        let a:conn.capabilities.references = 1
+    endif
+
     if get(a:capabilities, 'renameProvider') is v:true
         let a:conn.capabilities.rename = 1
     endif
 
+    if type(get(a:capabilities, 'renameProvider')) is v:t_dict
+        let a:conn.capabilities.rename = 1
+    endif
+
     if !empty(get(a:capabilities, 'completionProvider'))
         let a:conn.capabilities.completion = 1
     endif
@@ -220,13 +232,25 @@ function! s:UpdateCapabilities(conn, capabilities) abort
         let a:conn.capabilities.definition = 1
     endif
 
+    if type(get(a:capabilities, 'definitionProvider')) is v:t_dict
+        let a:conn.capabilities.definition = 1
+    endif
+
     if get(a:capabilities, 'typeDefinitionProvider') is v:true
         let a:conn.capabilities.typeDefinition = 1
     endif
 
+    if type(get(a:capabilities, 'typeDefinitionProvider')) is v:t_dict
+        let a:conn.capabilities.typeDefinition = 1
+    endif
+
     if get(a:capabilities, 'workspaceSymbolProvider') is v:true
         let a:conn.capabilities.symbol_search = 1
     endif
+
+    if type(get(a:capabilities, 'workspaceSymbolProvider')) is v:t_dict
+        let a:conn.capabilities.symbol_search = 1
+    endif
 endfunction
 
 " Update a connection's configuration dictionary and notify LSP servers
diff --git a/test/lsp/test_other_initialize_message_handling.vader b/test/lsp/test_other_initialize_message_handling.vader
index 6473e283..b6ef852a 100644
--- a/test/lsp/test_other_initialize_message_handling.vader
+++ b/test/lsp/test_other_initialize_message_handling.vader
@@ -131,7 +131,7 @@ Execute(Disabled capabilities should be recognised correctly):
   \     },
   \     'definitionProvider': v:false,
   \     'experimental': {},
-  \     'documentHighlightProvider': v:true
+  \     'documentHighlightProvider': v:true,
   \   },
   \ },
   \})
@@ -150,6 +150,57 @@ Execute(Disabled capabilities should be recognised correctly):
   \ b:conn.capabilities
   AssertEqual [[1, 'initialized', {}]], g:message_list
 
+Execute(Capabilities should be enabled when send as Dictionaries):
+  call ale#lsp#HandleInitResponse(b:conn, {
+  \ 'jsonrpc': '2.0',
+  \ 'id': 1,
+  \ 'result': {
+  \   'capabilities': {
+  \     'renameProvider': {},
+  \     'executeCommandProvider': {
+  \       'commands': [],
+  \     },
+  \     'hoverProvider': {},
+  \     'documentSymbolProvider': v:true,
+  \     'documentRangeFormattingProvider': v:true,
+  \     'codeLensProvider': {
+  \       'resolveProvider': v:false
+  \     },
+  \     'completionProvider': {
+  \       'triggerCharacters': ['.'],
+  \       'resolveProvider': v:false
+  \     },
+  \     'referencesProvider': {},
+  \     'textDocumentSync': 2,
+  \     'documentFormattingProvider': v:true,
+  \     'codeActionProvider': v:true,
+  \     'signatureHelpProvider': {
+  \       'triggerCharacters': ['(', ','],
+  \     },
+  \     'definitionProvider': {},
+  \     'typeDefinitionProvider': {},
+  \     'experimental': {},
+  \     'documentHighlightProvider': v:true,
+  \     'workspaceSymbolProvider': {}
+  \   },
+  \ },
+  \})
+
+  AssertEqual 1, b:conn.initialized
+  AssertEqual
+  \ {
+  \   'completion_trigger_characters': ['.'],
+  \   'completion': 1,
+  \   'references': 1,
+  \   'hover': 1,
+  \   'definition': 1,
+  \   'typeDefinition': 1,
+  \   'symbol_search': 1,
+  \   'rename': 1,
+  \ },
+  \ b:conn.capabilities
+  AssertEqual [[1, 'initialized', {}]], g:message_list
+
 Execute(Results that are not dictionaries should be handled correctly):
   call ale#lsp#HandleInitResponse(b:conn, {
   \ 'jsonrpc': '2.0',
-- 
cgit v1.2.3