From 5e9e520a23c549ff1b50a65e4b2665a2a1c2dd46 Mon Sep 17 00:00:00 2001
From: Pojok Code <asep.komarudin@dataon.com>
Date: Tue, 19 Nov 2024 09:03:01 +0700
Subject: [PATCH] enc: update config

---
 lazy-lock.json                            |  6 ++++--
 lua/auto-jdtls2/create_gradle_project.lua |  2 +-
 lua/auto-jdtls2/generate_java_class.lua   | 10 +++++-----
 lua/pcode/plugins/lang/java.lua           | 10 +++++++++-
 lua/pcode/user/java.lua                   |  1 +
 5 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/lazy-lock.json b/lazy-lock.json
index e0336c8..43db0ba 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,11 +1,12 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
   "Eva-Theme.nvim": { "branch": "master", "commit": "5e0ee05b7b803cbd781612d484b0796c45946a3d" },
+  "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" },
   "LuaSnip": { "branch": "master", "commit": "0f7bbce41ea152a94d12aea286f2ce98e63c0f58" },
   "alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" },
   "auto-bufferline.nvim": { "branch": "main", "commit": "f5835a4b62bfb6f6c829f8f050e5102ccf230b3e" },
   "auto-conform.nvim": { "branch": "main", "commit": "5f0897235e84bf2f8ff9d634e81678d5bfa63ab8" },
-  "auto-java-project.nvim": { "branch": "v2", "commit": "71107191bed6bac984b886af458d3ac405e7a5fb" },
+  "auto-java-project.nvim": { "branch": "v2", "commit": "0510829ee6780229efc409305b8da304a18f2754" },
   "auto-jdtls.nvim": { "branch": "main", "commit": "050da8d68c51a6e02a08d91329b7a848887927e7" },
   "auto-lint.nvim": { "branch": "main", "commit": "aff13cb8eaa055e66e940d43b7d83166397e5413" },
   "auto-lsp.nvim": { "branch": "main", "commit": "1f3ef04741972c107187a07be5615ff210888184" },
@@ -35,11 +36,12 @@
   "mini.indentscope": { "branch": "main", "commit": "da9af64649e114aa79480c238fd23f6524bc0903" },
   "minty": { "branch": "main", "commit": "a3d69bd63fc98f640815f94b797bf978e9193022" },
   "neotest": { "branch": "master", "commit": "6d3d22cdad49999ef774ebe1bc250a4994038964" },
+  "neotest-java": { "branch": "main", "commit": "e1371c1e9a09632bfaa7fbb5e8166e6f1d38201d" },
   "noice.nvim": { "branch": "main", "commit": "203f74adaae11d47440a667555b4af9156be807b" },
   "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
   "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" },
   "nvim-cmp": { "branch": "main", "commit": "f17d9b4394027ff4442b298398dfcaab97e40c4f" },
-  "nvim-colorizer.lua": { "branch": "master", "commit": "22a3b4c70641802587a6a0994894225e7815398b" },
+  "nvim-colorizer.lua": { "branch": "master", "commit": "f6bba01ddd16e15104c64c217348b21a7e2adaf2" },
   "nvim-dap": { "branch": "master", "commit": "cc92b054720a96170eca6bd9bdedd43d2b0a7a8a" },
   "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" },
   "nvim-dap-virtual-text": { "branch": "master", "commit": "76d80c3d171224315b61c006502a1e30c213a9ab" },
diff --git a/lua/auto-jdtls2/create_gradle_project.lua b/lua/auto-jdtls2/create_gradle_project.lua
index 4395750..1b9be45 100644
--- a/lua/auto-jdtls2/create_gradle_project.lua
+++ b/lua/auto-jdtls2/create_gradle_project.lua
@@ -65,7 +65,7 @@ local function gradle_new_project()
         end, 4000) -- Delay is set in milliseconds (3,000ms = 3 seconds)
       end
       -- Run the delayed quit function
-      delayed_quit()
+      -- delayed_quit()
     end
   end
 
diff --git a/lua/auto-jdtls2/generate_java_class.lua b/lua/auto-jdtls2/generate_java_class.lua
index cd1dd42..f314bbb 100644
--- a/lua/auto-jdtls2/generate_java_class.lua
+++ b/lua/auto-jdtls2/generate_java_class.lua
@@ -59,11 +59,11 @@ local function create_java_class()
   -- Format direktori dan path file berdasarkan input pengguna
   local package_dir = nil
   if package_name then
-    if is_maven_project() then
-      package_dir = string.format("src/main/java/%s", package_name:gsub("%.", "/"))
-    else
-      package_dir = string.format("app/src/main/java/%s", package_name:gsub("%.", "/"))
-    end
+    -- if is_maven_project() then
+    package_dir = string.format("src/main/java/%s", package_name:gsub("%.", "/"))
+    -- else
+    --   package_dir = string.format("app/src/main/java/%s", package_name:gsub("%.", "/"))
+    -- end
     if vim.fn.isdirectory(package_dir) == 0 then
       vim.fn.mkdir(package_dir, "p")
     end
diff --git a/lua/pcode/plugins/lang/java.lua b/lua/pcode/plugins/lang/java.lua
index 05ae309..d98a338 100644
--- a/lua/pcode/plugins/lang/java.lua
+++ b/lua/pcode/plugins/lang/java.lua
@@ -1,4 +1,11 @@
 local M = {}
+local is_gradle = function()
+  if vim.fn.findfile("pom.xml", vim.fn.getcwd()) == "pom.xml" then
+    return false
+  else
+    return true
+  end
+end
 M = {
   {
     "williamboman/mason-lspconfig.nvim",
@@ -49,7 +56,7 @@ M = {
         },
       }
     end,
-    enabled = vim.fn.findfile("build.gradle", vim.fn.getcwd()) == "build.gradle" or false,
+    enabled = is_gradle(),
     config = function(_, opts)
       -- get neotest namespace (api call creates or returns namespace)
       local neotest_ns = vim.api.nvim_create_namespace("neotest")
@@ -124,6 +131,7 @@ M = {
     "zeioth/project.nvim",
     cmd = "ProjectRoot",
     ft = { "java" },
+    -- enabled = vim.fn.findfile("build.gradle", vim.fn.getcwd()) == "build.gradle" or false,
     opts = {
       -- How to find root directory
       patterns = {
diff --git a/lua/pcode/user/java.lua b/lua/pcode/user/java.lua
index 553a3d1..3bddd1a 100644
--- a/lua/pcode/user/java.lua
+++ b/lua/pcode/user/java.lua
@@ -1,3 +1,4 @@
 require("auto-jdtls2.create_gradle_project")
 require("auto-jdtls2.create_maven_project")
 require("auto-jdtls2.create_springboot_project")
+require("auto-jdtls2.generate_java_class")