aboutsummaryrefslogtreecommitdiffstats
path: root/lua/nvim_lsp
diff options
context:
space:
mode:
Diffstat (limited to 'lua/nvim_lsp')
-rw-r--r--lua/nvim_lsp/bashls.lua1
-rw-r--r--lua/nvim_lsp/ccls.lua7
-rw-r--r--lua/nvim_lsp/clangd.lua3
-rw-r--r--lua/nvim_lsp/cssls.lua4
-rw-r--r--lua/nvim_lsp/elmls.lua4
-rw-r--r--lua/nvim_lsp/fortls.lua3
-rw-r--r--lua/nvim_lsp/intelephense.lua4
-rw-r--r--lua/nvim_lsp/leanls.lua2
-rw-r--r--lua/nvim_lsp/pyls.lua3
-rw-r--r--lua/nvim_lsp/pyls_ms.lua24
-rw-r--r--lua/nvim_lsp/sourcekit.lua3
-rw-r--r--lua/nvim_lsp/texlab.lua4
-rw-r--r--lua/nvim_lsp/tsserver.lua4
13 files changed, 16 insertions, 50 deletions
diff --git a/lua/nvim_lsp/bashls.lua b/lua/nvim_lsp/bashls.lua
index 68651e32..0bc9604c 100644
--- a/lua/nvim_lsp/bashls.lua
+++ b/lua/nvim_lsp/bashls.lua
@@ -27,7 +27,6 @@ configs[server_name] = {
end
end
end;
- -- on_attach = function(client, bufnr) end;
docs = {
description = [[
https://github.com/mads-hartmann/bash-language-server
diff --git a/lua/nvim_lsp/ccls.lua b/lua/nvim_lsp/ccls.lua
index 4accfc98..43d26722 100644
--- a/lua/nvim_lsp/ccls.lua
+++ b/lua/nvim_lsp/ccls.lua
@@ -2,14 +2,11 @@ local configs = require 'nvim_lsp/configs'
local util = require 'nvim_lsp/util'
configs.ccls = {
- default_config = util.utf8_config {
+ default_config = {
cmd = {"ccls"};
filetypes = {"c", "cpp", "objc", "objcpp"};
root_dir = util.root_pattern("compile_commands.json", "compile_flags.txt", ".git");
};
- -- commands = {};
- -- on_new_config = function(new_config) end;
- -- on_attach = function(client, bufnr) end;
docs = {
vscode = "ccls-project.ccls";
description = [[
@@ -20,8 +17,6 @@ as compile_commands.json or, for simpler projects, a compile_flags.txt.
]];
default_config = {
root_dir = [[root_pattern("compile_commands.json", "compile_flags.txt", ".git")]];
- on_init = [[function to handle changing offsetEncoding]];
- capabilities = [[default capabilities, with offsetEncoding utf-8]];
};
};
}
diff --git a/lua/nvim_lsp/clangd.lua b/lua/nvim_lsp/clangd.lua
index 34389721..24b8f2c8 100644
--- a/lua/nvim_lsp/clangd.lua
+++ b/lua/nvim_lsp/clangd.lua
@@ -12,9 +12,6 @@ configs.clangd = {
return root_pattern(filename) or util.path.dirname(filename)
end;
};
- -- commands = {};
- -- on_new_config = function(new_config) end;
- -- on_attach = function(client, bufnr) end;
docs = {
description = [[
https://clang.llvm.org/extra/clangd/Installation.html
diff --git a/lua/nvim_lsp/cssls.lua b/lua/nvim_lsp/cssls.lua
index c096440a..5517e7a1 100644
--- a/lua/nvim_lsp/cssls.lua
+++ b/lua/nvim_lsp/cssls.lua
@@ -13,7 +13,7 @@ local installer = util.npm_installer {
local root_pattern = util.root_pattern("package.json")
configs[server_name] = {
- default_config = util.utf8_config {
+ default_config = {
cmd = {bin_name, "--stdio"};
filetypes = {"css", "scss", "less"};
root_dir = function(fname)
@@ -47,8 +47,6 @@ npm install -g vscode-css-languageserver-bin
]];
default_config = {
root_dir = [[root_pattern("package.json")]];
- on_init = [[function to handle changing offsetEncoding]];
- capabilities = [[default capabilities, with offsetEncoding utf-8]];
};
};
}
diff --git a/lua/nvim_lsp/elmls.lua b/lua/nvim_lsp/elmls.lua
index 4f95cebf..15ce4e7d 100644
--- a/lua/nvim_lsp/elmls.lua
+++ b/lua/nvim_lsp/elmls.lua
@@ -17,7 +17,7 @@ default_capabilities.offsetEncoding = {"utf-8", "utf-16"}
local elm_root_pattern = util.root_pattern("elm.json")
configs[server_name] = {
- default_config = util.utf8_config {
+ default_config = {
cmd = {bin_name};
-- TODO(ashkan) if we comment this out, it will allow elmls to operate on elm.json. It seems like it could do that, but no other editor allows it right now.
filetypes = {"elm"};
@@ -62,8 +62,6 @@ npm install -g elm elm-test elm-format @elm-tooling/elm-language-server
]];
default_config = {
root_dir = [[root_pattern("elm.json")]];
- on_init = [[function to handle changing offsetEncoding]];
- capabilities = [[default capabilities, with offsetEncoding utf-8]];
};
};
}
diff --git a/lua/nvim_lsp/fortls.lua b/lua/nvim_lsp/fortls.lua
index 5eceb00c..54d26a45 100644
--- a/lua/nvim_lsp/fortls.lua
+++ b/lua/nvim_lsp/fortls.lua
@@ -10,8 +10,6 @@ configs.fortls = {
nthreads = 1,
};
};
- -- on_new_config = function(new_config) end;
- -- on_attach = function(client, bufnr) end;
docs = {
vscode = 'hansec.fortran-ls';
description = [[
@@ -24,5 +22,4 @@ Fortran Language Server for the Language Server Protocol
};
};
};
-
-- vim:et ts=2 sw=2
diff --git a/lua/nvim_lsp/intelephense.lua b/lua/nvim_lsp/intelephense.lua
index 2e5416ff..07d7eb09 100644
--- a/lua/nvim_lsp/intelephense.lua
+++ b/lua/nvim_lsp/intelephense.lua
@@ -11,7 +11,7 @@ local installer = util.npm_installer {
}
configs[server_name] = {
- default_config = util.utf8_config {
+ default_config = {
cmd = {bin_name, "--stdio"};
filetypes = {"php"};
root_dir = function (pattern)
@@ -44,8 +44,6 @@ npm install -g intelephense
]];
default_config = {
root_dir = [[root_pattern("composer.json", ".git")]];
- on_init = [[function to handle changing offsetEncoding]];
- capabilities = [[default capabilities, with offsetEncoding utf-8]];
init_options = [[{
storagePath = Optional absolute path to storage dir. Defaults to os.tmpdir().
globalStoragePath = Optional absolute path to a global storage dir. Defaults to os.homedir().
diff --git a/lua/nvim_lsp/leanls.lua b/lua/nvim_lsp/leanls.lua
index 0582868e..13400297 100644
--- a/lua/nvim_lsp/leanls.lua
+++ b/lua/nvim_lsp/leanls.lua
@@ -7,8 +7,6 @@ configs.leanls = {
filetypes = {"lean"};
root_dir = util.root_pattern(".git");
};
- -- on_new_config = function(new_config) end;
- -- on_attach = function(client, bufnr) end;
docs = {
vscode = "jroesch.lean";
description = [[
diff --git a/lua/nvim_lsp/pyls.lua b/lua/nvim_lsp/pyls.lua
index a3de9ae2..5c2bfc7c 100644
--- a/lua/nvim_lsp/pyls.lua
+++ b/lua/nvim_lsp/pyls.lua
@@ -9,8 +9,6 @@ configs.pyls = {
return util.path.dirname(fname)
end;
};
- -- on_new_config = function(new_config) end;
- -- on_attach = function(client, bufnr) end;
docs = {
package_json = "https://raw.githubusercontent.com/palantir/python-language-server/develop/vscode-client/package.json";
description = [[
@@ -23,5 +21,4 @@ https://github.com/palantir/python-language-server
};
};
};
-
-- vim:et ts=2 sw=2
diff --git a/lua/nvim_lsp/pyls_ms.lua b/lua/nvim_lsp/pyls_ms.lua
index daf90669..fa8241b4 100644
--- a/lua/nvim_lsp/pyls_ms.lua
+++ b/lua/nvim_lsp/pyls_ms.lua
@@ -107,21 +107,18 @@ configs[name] = {
installer.configure(config)
end;
init_options = {
- interpreter =
- {
- properties=
- {
- InterpreterPath=vim.fn.exepath("python");
- Version=get_python_version();
- };
- };
- displayOptions= {};
- analysisUpdates=true;
- asyncStartup=true;
+ interpreter = {
+ properties =
+ {
+ InterpreterPath = vim.fn.exepath("python");
+ Version = get_python_version();
+ };
+ };
+ displayOptions = {};
+ analysisUpdates = true;
+ asyncStartup = true;
};
};
- -- on_new_config = function(new_config) end;
- -- on_attach = function(client, bufnr) end;
docs = {
description = [[
https://github.com/Microsoft/python-language-server
@@ -153,3 +150,4 @@ This server accepts configuration via the `settings` key.
configs[name].install = installer.install
configs[name].install_info = installer.info
+-- vim:et ts=2 sw=2
diff --git a/lua/nvim_lsp/sourcekit.lua b/lua/nvim_lsp/sourcekit.lua
index 4a406280..21abbd94 100644
--- a/lua/nvim_lsp/sourcekit.lua
+++ b/lua/nvim_lsp/sourcekit.lua
@@ -7,8 +7,6 @@ configs.sourcekit = {
filetypes = {"swift"};
root_dir = util.root_pattern("Package.swift", ".git")
};
- -- on_new_config = function(new_config) end;
- -- on_attach = function(client, bufnr) end;
docs = {
package_json = "https://raw.githubusercontent.com/apple/sourcekit-lsp/master/Editors/vscode/package.json";
description = [[
@@ -21,5 +19,4 @@ Language server for Swift and C/C++/Objective-C.
};
};
};
-
-- vim:et ts=2 sw=2
diff --git a/lua/nvim_lsp/texlab.lua b/lua/nvim_lsp/texlab.lua
index 374666fc..695cdaaf 100644
--- a/lua/nvim_lsp/texlab.lua
+++ b/lua/nvim_lsp/texlab.lua
@@ -66,11 +66,7 @@ configs.texlab = {
end;
description = "Build the current buffer";
};
- -- TexlabCancelAllBuilds = {
- -- };
};
- -- on_new_config = function(new_config) end;
- -- on_attach = function(client, bufnr) end;
docs = {
description = [[
https://texlab.netlify.com/
diff --git a/lua/nvim_lsp/tsserver.lua b/lua/nvim_lsp/tsserver.lua
index 6a9eae8b..1bfc65f4 100644
--- a/lua/nvim_lsp/tsserver.lua
+++ b/lua/nvim_lsp/tsserver.lua
@@ -14,7 +14,7 @@ local installer = util.npm_installer {
}
configs[server_name] = {
- default_config = util.utf8_config {
+ default_config = {
cmd = {bin_name, "--stdio"};
filetypes = {"javascript", "javascriptreact", "javascript.jsx", "typescript", "typescriptreact", "typescript.tsx"};
root_dir = util.root_pattern("package.json", "tsconfig.json", ".git");
@@ -41,8 +41,6 @@ npm install -g typescript-language-server
]];
default_config = {
root_dir = [[root_pattern("package.json", "tsconfig.json", ".git")]];
- on_init = [[function to handle changing offsetEncoding]];
- capabilities = [[default capabilities, with offsetEncoding utf-8]];
};
};
}