diff options
| author | christianchiarulli <[email protected]> | 2021-07-05 16:26:31 -0400 | 
|---|---|---|
| committer | christianchiarulli <[email protected]> | 2021-07-05 16:26:31 -0400 | 
| commit | 20485971641a9d916640ccad05586a641c984ed6 (patch) | |
| tree | d397a3a9adba502b4c26b802d897b8310972f76f /ftplugin/kotlin.lua | |
| parent | 56e82dac4497293541099185441485dd31e98dc8 (diff) | |
| parent | a469c710bfc01f291df68dba40464caaa2b496da (diff) | |
Merge branch 'master' of github.com:ChristianChiarulli/LunarVim into stable
Diffstat (limited to 'ftplugin/kotlin.lua')
| -rw-r--r-- | ftplugin/kotlin.lua | 32 | 
1 files changed, 15 insertions, 17 deletions
| diff --git a/ftplugin/kotlin.lua b/ftplugin/kotlin.lua index fcbb736b..dbd800b9 100644 --- a/ftplugin/kotlin.lua +++ b/ftplugin/kotlin.lua @@ -6,31 +6,29 @@  --- 	https://github.com/udalov/kotlin-vim (recommended)  --- 	Note that there is no LICENSE specified yet. -local util = require 'lspconfig/util' +local util = require "lspconfig/util"  local bin_name = DATA_PATH .. "/lspinstall/kotlin/server/bin/kotlin-language-server" -if vim.fn.has('win32') == 1 then -  bin_name = bin_name..".bat" +if vim.fn.has "win32" == 1 then +  bin_name = bin_name .. ".bat"  end  local root_files = { -  'settings.gradle',       -- Gradle (multi-project) -  'settings.gradle.kts',   -- Gradle (multi-project) -  'build.xml',             -- Ant -  'pom.xml',               -- Maven +  "settings.gradle", -- Gradle (multi-project) +  "settings.gradle.kts", -- Gradle (multi-project) +  "build.xml", -- Ant +  "pom.xml", -- Maven  }  local fallback_root_files = { -  'build.gradle',          -- Gradle -  'build.gradle.kts',      -- Gradle +  "build.gradle", -- Gradle +  "build.gradle.kts", -- Gradle  } -require'lspconfig'.kotlin_language_server.setup { -    cmd = {bin_name}, -    on_attach = require'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 +require("lspconfig").kotlin_language_server.setup { +  cmd = { bin_name }, +  on_attach = require("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,  } - | 
