5 files changed, 11 insertions, 4 deletions
diff --git a/lua/nvim_lsp/codeqlls.lua b/lua/nvim_lsp/codeqlls.lua
index 827803b1..613d551e 100644
--- a/lua/nvim_lsp/codeqlls.lua
+++ b/lua/nvim_lsp/codeqlls.lua
@@ -24,7 +24,7 @@ configs[server_name] = {
         };
     };
     docs = {
-        package_json = "https://raw.githubusercontent.com/github/vscode-codeql/master/extensions/ql-vscode/package.json";
+        package_json = "https://raw.githubusercontent.com/github/vscode-codeql/main/extensions/ql-vscode/package.json";
         description = [[
 Reference:
 https://help.semmle.com/codeql/codeql-cli.html
diff --git a/lua/nvim_lsp/ocamllsp.lua b/lua/nvim_lsp/ocamllsp.lua
index 11393893..c029e427 100644
--- a/lua/nvim_lsp/ocamllsp.lua
+++ b/lua/nvim_lsp/ocamllsp.lua
@@ -5,7 +5,7 @@ configs.ocamllsp = {
   default_config = {
     cmd = {"ocamllsp",};
     filetypes = {'ocaml', 'reason'};
-    root_dir = util.root_pattern("merlin", "package.json", ".git");
+    root_dir = util.root_pattern(".merlin", "package.json", ".git");
   };
   docs = {
     description = [[
diff --git a/lua/nvim_lsp/solargraph.lua b/lua/nvim_lsp/solargraph.lua
index 9532f21a..ee023a1c 100644
--- a/lua/nvim_lsp/solargraph.lua
+++ b/lua/nvim_lsp/solargraph.lua
@@ -1,9 +1,13 @@
 local configs = require 'nvim_lsp/configs'
 local util = require 'nvim_lsp/util'
 
+local bin_name = "solargraph"
+if vim.fn.has('win32') == 1 then
+  bin_name = bin_name..'.bat'
+end
 configs.solargraph = {
   default_config = {
-    cmd = {"solargraph", "stdio"};
+    cmd = {bin_name, "stdio"};
     filetypes = {"ruby"};
     root_dir = util.root_pattern("Gemfile", ".git");
   };
diff --git a/lua/nvim_lsp/sourcekit.lua b/lua/nvim_lsp/sourcekit.lua
index 21abbd94..e4dc0042 100644
--- a/lua/nvim_lsp/sourcekit.lua
+++ b/lua/nvim_lsp/sourcekit.lua
@@ -4,7 +4,7 @@ local util = require 'nvim_lsp/util'
 configs.sourcekit = {
   default_config = {
     cmd = {"xcrun", "sourcekit-lsp"};
-    filetypes = {"swift"};
+    filetypes = {"swift", "c", "cpp", "objective-c", "objective-cpp"};
     root_dir = util.root_pattern("Package.swift", ".git")
   };
   docs = {
diff --git a/lua/nvim_lsp/vimls.lua b/lua/nvim_lsp/vimls.lua
index 88839699..9f715289 100644
--- a/lua/nvim_lsp/vimls.lua
+++ b/lua/nvim_lsp/vimls.lua
@@ -3,6 +3,9 @@ local util = require "nvim_lsp/util"
 
 local server_name = "vimls"
 local bin_name = "vim-language-server"
+if vim.fn.has('win32') == 1 then
+  bin_name = bin_name..".cmd"
+end
 
 local installer = util.npm_installer {
   server_name = server_name,