chore: improvements and optimizations

kevinm6 · Jan 4, 2025 · a4bede2 · a4bede2
1 parent de423c0
commit a4bede2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 31 deletions.
diff --git a/after/ftplugin/java.lua b/after/ftplugin/java.lua
@@ -11,6 +11,8 @@ if not has_jdtls then
   return
 end
 
+local javaBin = vim.fn.expand [[C:\Program Files\Amazon Corretto\jdk17.0.13_11\bin\java.exe]]
+
 local data_path = vim.fn.stdpath "data"
 
 local capabilities = require("plugins.lsp").capabilities()
@@ -19,7 +21,7 @@ local extendedClientCapabilities = require("jdtls").extendedClientCapabilities
 extendedClientCapabilities.resolveAdditionalTextEditsSupport = true
 extendedClientCapabilities.document_formatting = false
 
-local root_dir = vim.fs.root(0, { ".git", "mvnw", "gradlew", "pom.xml" }) or vim.uv.cwd()
+local root_dir = vim.fs.root(0, { ".git", "mvnw", "gradlew", "pom.xml" }) or vim.fs.dirname(vim.api.nvim_buf_get_name(0))
 local cache_dir = vim.fn.stdpath "cache"
 local project_name = vim.fs.basename(root_dir)
 local workspace_dir = string.format("%s/java/wksp/%s", cache_dir, project_name)
@@ -31,9 +33,6 @@ local bundles = vim.fn.glob(
   true
 )
 
--- Example usage: Run the function with the desired task
--- RunGradleTask('test')
-
 local lombok_path = data_path .. "/mason/packages/jdtls/lombok.jar"
 
 local function get_config_dir()
@@ -63,7 +62,7 @@ vim.list_extend(
 
 local config = {
   cmd = {
-    "java",
+    javaBin,
     "-Declipse.application=org.eclipse.jdt.ls.core.id1",
     "-Dosgi.bundles.defaultStartLevel=4",
     "-Declipse.product=org.eclipse.jdt.ls.core.product",
@@ -121,15 +120,15 @@ local config = {
         runtimes = {
           {
             name = "JavaSE-17",
-            path = "C:/Program Files/Amazon Corretto/jdk17.0.13_11",
+            path = [[C:\Program Files\Amazon Corretto\jdk17.0.13_11]],
           },
           {
             name = "JavaSE-1.8",
-            path = "C:/Program Files/Amazon Corretto/jdk1.8.0_432",
+            path = [[C:\Program Files\Amazon Corretto\jdk1.8.0_432]],
           },
           {
             name = "JavaSE-11",
-            path = "C:/Program Files/Amazon Corretto/jdk11.0.25_9",
+            path = [[C:\Program Files\Amazon Corretto\jdk11.0.25_9]],
           },
         },
       },
@@ -214,12 +213,12 @@ local config = {
 
     require("plugins.lsp").on_attach(client, bufnr)
 
-    vim.api.nvim_create_autocmd("BufWritePost", {
-      buffer = bufnr,
-      callback = function()
-        client.request_sync("java/buildWorkspace", false, 5000, bufnr)
-      end,
-    })
+    -- vim.api.nvim_create_autocmd("BufWritePost", {
+    --   buffer = bufnr,
+    --   callback = function()
+    --     client.request_sync("java/buildWorkspace", false, 5000, bufnr)
+    --   end,
+    -- })
     local function map(tbl)
       vim.keymap.set(tbl[1], tbl[2], tbl[3], { buffer = bufnr, desc = "Java❭ " .. tbl[4] })
     end

diff --git a/lua/plugins/lsp/init.lua b/lua/plugins/lsp/init.lua
@@ -300,30 +300,17 @@ return {
 
         groovyls = function()
           lspconfig.groovyls.setup(vim.tbl_deep_extend("force", default_lsp_config, {
-
+            java = {
+              home = [[C:\Program Files\Amazon Corretto\jdk11.0.25_9]]
+            },
             root_dir = function()
-              return vim.fs.dirname(vim.api.nvim_buf_get_name(0))
+              return vim.fs.root(0, 'Resources/') or vim.fs.dirname(vim.api.nvim_buf_get_name(0))
             end,
             settings = {
               groovy = {
                 classpath = {
-                  [[C:\Program Files\Java\jre1.8.0_421\lib\rt.jar]],
-                  [[C:\Intel\spagic-studio-win-3.5.1-64Bit\spagic-studio-win-3.5.1-64Bit\spagic-studio\plugins\]],
-                  [[C:\Intel\spagic-studio-win-3.5.1-64Bit\spagic-studio-win-3.5.1-64Bit\spagic-studio\]],
-                  [[C:\Intel\eclipseWSO2\plugins\]],
                   [[C:\wso2ei\wso2\components\plugins\]],
-                  -- [[C:\wso2ei-eng-1.1.1\patches\patch0000]],
-                  [[C:\wso2ei\patches\patch00001]],
-                  [[C:\wso2ei\patches\patch00002]]
                 },
-                project = {
-                  referencedLibraries = {
-                    include = {
-                      "C:/wso2_Developer/plugins/**/*.jar",
-                      "C:/wso2/wksp/**/*.jar",
-                    }
-                  }
-                }
               }
             }
           }))