From 503a58c0643e159d774137e7eda693523478fec6 Mon Sep 17 00:00:00 2001 From: Michael Lingelbach Date: Fri, 15 Jan 2021 10:23:53 -0800 Subject: kotlin: update roots to fallback to build.gradle --- lua/lspconfig/kotlin_language_server.lua | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'lua') 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 = { -- cgit v1.2.3-70-g09d2