6 files changed, 10 insertions, 3 deletions

diff --git a/lua/nvim_lsp/ccls.lua b/lua/nvim_lsp/ccls.lua
index 88795526..ea15b813 100644
--- a/lua/nvim_lsp/ccls.lua
+++ b/lua/nvim_lsp/ccls.lua
@@ -14,6 +14,7 @@ skeleton.ccls = {
   -- on_new_config = function(new_config) end;
   -- on_attach = function(client, bufnr) end;
   docs = {
+    vscode = "ccls-project.ccls";
     description = [[
 https://github.com/MaskRay/ccls/wiki
 
diff --git a/lua/nvim_lsp/elmls.lua b/lua/nvim_lsp/elmls.lua
index 93dce340..69a84f3e 100644
--- a/lua/nvim_lsp/elmls.lua
+++ b/lua/nvim_lsp/elmls.lua
@@ -53,6 +53,7 @@ skeleton[server_name] = {
     end
   end;
   docs = {
+    vscode = "Elmtooling.elm-ls-vscode";
     description = [[
 https://github.com/elm-tooling/elm-language-server#installation
 
diff --git a/lua/nvim_lsp/fortls.lua b/lua/nvim_lsp/fortls.lua
index 630034ed..b4de1e78 100644
--- a/lua/nvim_lsp/fortls.lua
+++ b/lua/nvim_lsp/fortls.lua
@@ -15,6 +15,7 @@ skeleton.fortls = {
   -- on_new_config = function(new_config) end;
   -- on_attach = function(client, bufnr) end;
   docs = {
+    vscode = 'hansec.fortran-ls';
     description = [[
 https://github.com/hansec/fortran-language-server
 
diff --git a/lua/nvim_lsp/leanls.lua b/lua/nvim_lsp/leanls.lua
index 0f2e9618..77a045df 100644
--- a/lua/nvim_lsp/leanls.lua
+++ b/lua/nvim_lsp/leanls.lua
@@ -13,10 +13,11 @@ skeleton.leanls = {
   -- on_new_config = function(new_config) end;
   -- on_attach = function(client, bufnr) end;
   docs = {
+    vscode = "jroesch.lean";
     description = [[
-    https://github.com/leanprover/lean-client-js/tree/master/lean-language-server
+https://github.com/leanprover/lean-client-js/tree/master/lean-language-server
 
-    Lean language server.
+Lean language server.
     ]];
     default_config = {
       root_dir = [[util.root_pattern(".git")]];
diff --git a/lua/nvim_lsp/skeleton.lua b/lua/nvim_lsp/skeleton.lua
index 9ab91598..ff26e14b 100644
--- a/lua/nvim_lsp/skeleton.lua
+++ b/lua/nvim_lsp/skeleton.lua
@@ -39,7 +39,9 @@ function skeleton.__newindex(t, template_name, template)
   local function add_callbacks(config)
     config.callbacks["window/logMessage"] = function(err, method, params, client_id)
       if params and params.type <= config.log_level then
-        lsp.default_callbacks[method](err, method, params, client_id)
+        -- TODO(ashkan) remove this after things have settled.
+        assert(lsp.callbacks, "Please update neovim master. This is an incompatible interface.")
+        lsp.callbacks[method](err, method, params, client_id)
       end
     end
 
diff --git a/lua/nvim_lsp/solargraph.lua b/lua/nvim_lsp/solargraph.lua
index d42e847f..547fa9c8 100644
--- a/lua/nvim_lsp/solargraph.lua
+++ b/lua/nvim_lsp/solargraph.lua
@@ -11,6 +11,7 @@ skeleton.solargraph = {
     settings = {};
   };
   docs = {
+    vscode = "castwide.solargraph";
     package_json = "https://raw.githubusercontent.com/castwide/vscode-solargraph/master/package.json";
     description = [[
 https://solargraph.org/