From c023a6832c4301923a20e2c1d65be3d50ff42efd Mon Sep 17 00:00:00 2001
From: dareni <ikkyisaacs@gmail.com>
Date: Tue, 23 Sep 2025 05:43:59 +1000
Subject: fix(jdtls): lower priority of ".git" root marker #4090

---
 lsp/jdtls.lua | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

(limited to 'lsp')

diff --git a/lsp/jdtls.lua b/lsp/jdtls.lua
index 4ea904f9..cfd32aaf 100644
--- a/lsp/jdtls.lua
+++ b/lsp/jdtls.lua
@@ -63,6 +63,20 @@ local function get_jdtls_jvm_args()
   return unpack(args)
 end
 
+local root_markers1 = {
+  -- Multi-module projects
+  'build.gradle',
+  'build.gradle.kts',
+  -- Single-module projects
+  'build.xml', -- Ant
+  'pom.xml', -- Maven
+  'settings.gradle', -- Gradle
+  'settings.gradle.kts', -- Gradle
+}
+local root_markers2 = {
+  '.git',
+}
+
 ---@type vim.lsp.Config
 return {
   cmd = {
@@ -74,17 +88,8 @@ return {
     get_jdtls_jvm_args(),
   },
   filetypes = { 'java' },
-  root_markers = {
-    -- Multi-module projects
-    '.git',
-    'build.gradle',
-    'build.gradle.kts',
-    -- Single-module projects
-    'build.xml', -- Ant
-    'pom.xml', -- Maven
-    'settings.gradle', -- Gradle
-    'settings.gradle.kts', -- Gradle
-  },
+  root_markers = vim.fn.has('nvim-0.11.3') == 1 and { root_markers1, root_markers2 }
+    or vim.list_extend(root_markers1, root_markers2),
   init_options = {
     workspace = get_jdtls_workspace_dir(),
     jvm_args = {},
-- 
cgit v1.2.3-70-g09d2