aboutsummaryrefslogtreecommitdiffstats
path: root/lua
diff options
context:
space:
mode:
authorMichael Lingelbach <m.j.lbach@gmail.com>2021-01-26 13:01:31 -0800
committerGitHub <noreply@github.com>2021-01-26 13:01:31 -0800
commita195209c84ad7594a2a7c9bff6d90ae7ef7ccdb0 (patch)
treeb4679de422dc5d60a6cedf648d61dba9a8839ce8 /lua
parent[docgen] Update CONFIG.md (diff)
parentkotlin: update roots to fallback to build.gradle (diff)
downloadnvim-lspconfig-a195209c84ad7594a2a7c9bff6d90ae7ef7ccdb0.tar
nvim-lspconfig-a195209c84ad7594a2a7c9bff6d90ae7ef7ccdb0.tar.gz
nvim-lspconfig-a195209c84ad7594a2a7c9bff6d90ae7ef7ccdb0.tar.bz2
nvim-lspconfig-a195209c84ad7594a2a7c9bff6d90ae7ef7ccdb0.tar.lz
nvim-lspconfig-a195209c84ad7594a2a7c9bff6d90ae7ef7ccdb0.tar.xz
nvim-lspconfig-a195209c84ad7594a2a7c9bff6d90ae7ef7ccdb0.tar.zst
nvim-lspconfig-a195209c84ad7594a2a7c9bff6d90ae7ef7ccdb0.zip
Merge pull request #671 from mjlbach/kotlin_update_roots
kotlin: update roots to fallback to build.gradle
Diffstat (limited to 'lua')
-rw-r--r--lua/lspconfig/kotlin_language_server.lua12
1 files changed, 9 insertions, 3 deletions
diff --git a/lua/lspconfig/kotlin_language_server.lua b/lua/lspconfig/kotlin_language_server.lua
index 793fc062..b563b5c5 100644
--- a/lua/lspconfig/kotlin_language_server.lua
+++ b/lua/lspconfig/kotlin_language_server.lua
@@ -21,10 +21,13 @@ end
-- Kotlin. I am not sure whether the language server supports Ant projects,
-- but I'm keeping it here as well since Ant does support Kotlin.
local root_files = {
+ 'settings.gradle', -- Gradle (multi-project)
+ 'settings.gradle.kts', -- Gradle (multi-project)
'build.xml', -- Ant
'pom.xml', -- Maven
- 'settings.gradle', -- Gradle (mutli-project)
- 'settings.gradle.kts', -- Gradle (mutli-project)
+}
+
+local fallback_root_files = {
'build.gradle', -- Gradle
'build.gradle.kts', -- Gradle
}
@@ -32,7 +35,10 @@ local root_files = {
configs.kotlin_language_server = {
default_config = {
filetypes = { "kotlin" };
- root_dir = util.root_pattern(unpack(root_files));
+ root_dir = function(fname)
+ return util.root_pattern(unpack(root_files))(fname) or
+ util.root_pattern(unpack(fallback_root_files))(fname)
+ end;
cmd = { bin_name };
};
docs = {