From 60175ee0d67a12cc617c68aad983ed4e12d98ad9 Mon Sep 17 00:00:00 2001 From: Marek Filipowicz Date: Sat, 26 Jun 2021 20:25:20 +0200 Subject: [PATCH] feat(kotlin): Replace current custom kotlin installation with LspInstall kotlin (#518) --- lua/lsp/kotlin-ls.lua | 2 +- lua/lv-lspinstall/init.lua | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lua/lsp/kotlin-ls.lua b/lua/lsp/kotlin-ls.lua index 0a92696e..fcbb736b 100644 --- a/lua/lsp/kotlin-ls.lua +++ b/lua/lsp/kotlin-ls.lua @@ -8,7 +8,7 @@ local util = require 'lspconfig/util' -local bin_name = DATA_PATH .. "/lspinstall/kotlin/language-server/server/build/install/server/bin/kotlin-language-server" +local bin_name = DATA_PATH .. "/lspinstall/kotlin/server/bin/kotlin-language-server" if vim.fn.has('win32') == 1 then bin_name = bin_name..".bat" end diff --git a/lua/lv-lspinstall/init.lua b/lua/lv-lspinstall/init.lua index bc1469a5..0ad1cd08 100644 --- a/lua/lv-lspinstall/init.lua +++ b/lua/lv-lspinstall/init.lua @@ -15,13 +15,13 @@ require'lspconfig/configs'.jdtls = nil -- important, unset the loaded config aga -- uninstall_script = nil -- can be omitted -- }) -require'lspinstall/servers'.kotlin = vim.tbl_extend('error', config, { - install_script = [[ - git clone https://github.com/fwcd/kotlin-language-server.git language-server - cd language-server - ./gradlew :server:installDist - ]], - uninstall_script = nil -- can be omitted -}) +-- require'lspinstall/servers'.kotlin = vim.tbl_extend('error', config, { +-- install_script = [[ +-- git clone https://github.com/fwcd/kotlin-language-server.git language-server +-- cd language-server +-- ./gradlew :server:installDist +-- ]], +-- uninstall_script = nil -- can be omitted +-- }) require'lspinstall'.setup()