a lot more stuff

1 files changed, 8 insertions, 6 deletions

diff --git a/lua/conf/plugins/jdtls.lua b/lua/conf/plugins/jdtls.lua
index c847e5a..b6dbd72 100644
--- a/lua/conf/plugins/jdtls.lua
+++ b/lua/conf/plugins/jdtls.lua
@@ -3,7 +3,7 @@ local lsp = require('core.lsp.functions')
 local map, auto = misc.map, misc.auto
 
 return { 'mfussenegger/nvim-jdtls',
-  disable = vim.version().minor < 6,
+  disable = not vim.fn.has("nvim-0.6.0"),
   requires = 'mfussenegger/nvim-dap',
   function()
     auto("FileType", {
@@ -34,7 +34,10 @@ return { 'mfussenegger/nvim-jdtls',
             'gradlew',
             '.git',
             'mvnw',
-            'build.xml'
+            'settings.gradle', -- Gradle (multi-project)
+            'settings.gradle.kts', -- Gradle (multi-project)
+            'build.xml', -- Ant
+            'pom.xml', -- Maven
           }, { upward = true })[1]),
 
           -- don't print out status messages
@@ -42,10 +45,7 @@ return { 'mfussenegger/nvim-jdtls',
             ['language/status'] = function() end
           },
 
-          capabilities = lsp.capabilities(),
-          on_attach = function(client, bufnr)
-            lsp.attach(client, bufnr)
-
+          on_attach = function(_, bufnr)
             -- add some jdtls specific mappings
             local opts = { buffer = bufnr }
             map('n', 'cri', jdtls.organize_imports, opts)
@@ -64,8 +64,10 @@ return { 'mfussenegger/nvim-jdtls',
               end
             })
           end,
+          capabilities = lsp.capabilities
         }
 
+        -- generate the path to the java file(s)
         ---@type string|nil
         local cache_path = vim.fs.joinpath(vim.fn.stdpath("cache"), "/JavaVersion.class")
         ---@type string|nil