aboutsummaryrefslogtreecommitdiffstats
path: root/lua
diff options
context:
space:
mode:
authorHirokazu Hata <h.hata.ai.t@gmail.com>2020-08-10 15:41:33 +0900
committerGitHub <noreply@github.com>2020-08-10 15:41:33 +0900
commita1ec62baab1dba2c6f5c0ca4962b4da3e856a237 (patch)
tree11fcbf03b05f5e1d8c73b35a7dd5c3603ea65aa5 /lua
parentMerge pull request #318 from ciarand/patch-1 (diff)
parentAdd extension to vimls command name on Windows (diff)
downloadnvim-lspconfig-a1ec62baab1dba2c6f5c0ca4962b4da3e856a237.tar
nvim-lspconfig-a1ec62baab1dba2c6f5c0ca4962b4da3e856a237.tar.gz
nvim-lspconfig-a1ec62baab1dba2c6f5c0ca4962b4da3e856a237.tar.bz2
nvim-lspconfig-a1ec62baab1dba2c6f5c0ca4962b4da3e856a237.tar.lz
nvim-lspconfig-a1ec62baab1dba2c6f5c0ca4962b4da3e856a237.tar.xz
nvim-lspconfig-a1ec62baab1dba2c6f5c0ca4962b4da3e856a237.tar.zst
nvim-lspconfig-a1ec62baab1dba2c6f5c0ca4962b4da3e856a237.zip
Merge pull request #298 from erw7/fix-windows-batch
Diffstat (limited to 'lua')
-rw-r--r--lua/nvim_lsp/solargraph.lua6
-rw-r--r--lua/nvim_lsp/vimls.lua3
2 files changed, 8 insertions, 1 deletions
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/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,