From 88616bde7c7b5b25f505997aa2171245f7341453 Mon Sep 17 00:00:00 2001 From: Gustaf Rydholm Date: Thu, 8 Jul 2021 20:17:26 +0200 Subject: Updates to lang stuff --- .config/nvim/ftplugin/kotlin.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to '.config/nvim/ftplugin/kotlin.lua') diff --git a/.config/nvim/ftplugin/kotlin.lua b/.config/nvim/ftplugin/kotlin.lua index dbd800b..eb5f5f5 100644 --- a/.config/nvim/ftplugin/kotlin.lua +++ b/.config/nvim/ftplugin/kotlin.lua @@ -1,3 +1,7 @@ +if require("cfg.utils").check_lsp_client_active "kotlin_language_server" then + return +end + --- default config for gradle-projects of the --- kotlin-language-server: https://github.com/fwcd/kotlin-language-server --- @@ -27,7 +31,7 @@ local fallback_root_files = { require("lspconfig").kotlin_language_server.setup { cmd = { bin_name }, - on_attach = require("lsp").common_on_attach, + on_attach = require("cfg.lsp").common_on_attach, root_dir = function(fname) return util.root_pattern(unpack(root_files))(fname) or util.root_pattern(unpack(fallback_root_files))(fname) end, -- cgit v1.2.3-70-g09d2