From 762c6733659e4ea4db84f7b2004aa5a82bfb5339 Mon Sep 17 00:00:00 2001 From: Alex Selimov Date: Wed, 3 Sep 2025 11:21:58 -0400 Subject: [PATCH 1/3] Fix java configuration --- ftplugin/java.lua | 5 ++++- ftplugin/java.vim | 1 - lua/plugins/lsp.lua | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) delete mode 100644 ftplugin/java.vim diff --git a/ftplugin/java.lua b/ftplugin/java.lua index 8b13789..e9b8248 100644 --- a/ftplugin/java.lua +++ b/ftplugin/java.lua @@ -1 +1,4 @@ - +vim.opt_local.shiftwidth = 2 +vim.opt_local.tabstop = 2 +vim.opt_local.tw = 180 +vim.opt_local.colorcolumn = "+1" diff --git a/ftplugin/java.vim b/ftplugin/java.vim deleted file mode 100644 index 95c752b..0000000 --- a/ftplugin/java.vim +++ /dev/null @@ -1 +0,0 @@ -set tw=120 diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 4cd33e8..e8c0328 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -3,6 +3,7 @@ return { { "mfussenegger/nvim-jdtls", + ft = "java", config = function() local jdtls = require("jdtls") @@ -13,7 +14,7 @@ return { local style_path = vim.fn.expand("~/.config/nvim/GoogleStyle.xml") local config = { - cmd = { "jdtls" }, -- or path to your startup script + cmd = { "/Library/Java/JavaVirtualMachines/temurin-21.jdk/Contents/Home/bin/java", "-Declipse.application=org.eclipse.jdt.ls.core.id1", "-Dosgi.bundles.defaultStartLevel=4", "-Declipse.product=org.eclipse.jdt.ls.core.product", "-Dlog.protocol=true", "-Dlog.level=ALL", "-Xms1g", "--add-modules=ALL-SYSTEM", "--add-opens", "java.base/java.util=ALL-UNNAMED", "--add-opens", "java.base/java.lang=ALL-UNNAMED", "-jar", vim.fn.glob(vim.fn.stdpath("data") .. "/mason/packages/jdtls/plugins/org.eclipse.equinox.launcher_*.jar"), "-configuration", vim.fn.glob(vim.fn.stdpath("data") .. "/mason/packages/jdtls/config_mac"), "-data", vim.fn.expand("~/.cache/jdtls-workspace/") .. "/" .. root_dir:gsub(":", "_") }, root_dir = root_dir, settings = { java = { @@ -163,6 +164,7 @@ return { local ensure_installed = vim.tbl_keys(servers or {}) vim.list_extend(ensure_installed, { + "jdtls", "stylua", "black", "clang-format", From 66f4f32dc6c7d1da0ce8eaac61a61eb5471d4510 Mon Sep 17 00:00:00 2001 From: Alex Selimov Date: Wed, 3 Sep 2025 11:36:49 -0400 Subject: [PATCH 2/3] Pull out java version into environment variable --- lua/plugins/lsp.lua | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index e8c0328..16adf41 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -13,8 +13,31 @@ return { -- Path to your exported Eclipse/IntelliJ style xml local style_path = vim.fn.expand("~/.config/nvim/GoogleStyle.xml") + local java_home = os.getenv("NVIM_JDTLS_JAVA_HOME") + local config = { - cmd = { "/Library/Java/JavaVirtualMachines/temurin-21.jdk/Contents/Home/bin/java", "-Declipse.application=org.eclipse.jdt.ls.core.id1", "-Dosgi.bundles.defaultStartLevel=4", "-Declipse.product=org.eclipse.jdt.ls.core.product", "-Dlog.protocol=true", "-Dlog.level=ALL", "-Xms1g", "--add-modules=ALL-SYSTEM", "--add-opens", "java.base/java.util=ALL-UNNAMED", "--add-opens", "java.base/java.lang=ALL-UNNAMED", "-jar", vim.fn.glob(vim.fn.stdpath("data") .. "/mason/packages/jdtls/plugins/org.eclipse.equinox.launcher_*.jar"), "-configuration", vim.fn.glob(vim.fn.stdpath("data") .. "/mason/packages/jdtls/config_mac"), "-data", vim.fn.expand("~/.cache/jdtls-workspace/") .. "/" .. root_dir:gsub(":", "_") }, + cmd = { + java_home .. "/bin/java", + "-Declipse.application=org.eclipse.jdt.ls.core.id1", + "-Dosgi.bundles.defaultStartLevel=4", + "-Declipse.product=org.eclipse.jdt.ls.core.product", + "-Dlog.protocol=true", + "-Dlog.level=ALL", + "-Xms1g", + "--add-modules=ALL-SYSTEM", + "--add-opens", + "java.base/java.util=ALL-UNNAMED", + "--add-opens", + "java.base/java.lang=ALL-UNNAMED", + "-jar", + vim.fn.glob( + vim.fn.stdpath("data") .. "/mason/packages/jdtls/plugins/org.eclipse.equinox.launcher_*.jar" + ), + "-configuration", + vim.fn.glob(vim.fn.stdpath("data") .. "/mason/packages/jdtls/config_mac"), + "-data", + vim.fn.expand("~/.cache/jdtls-workspace/") .. "/" .. root_dir:gsub(":", "_"), + }, root_dir = root_dir, settings = { java = { @@ -192,4 +215,4 @@ return { }) end, }, -} \ No newline at end of file +} From 12b25aa2b49144940f8f37e3f3832ce98b6b062d Mon Sep 17 00:00:00 2001 From: Alex Selimov Date: Wed, 3 Sep 2025 11:39:49 -0400 Subject: [PATCH 3/3] Fix markdown errors when opening java files --- lua/plugins/editor.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua index 0460c4e..5e45b8e 100644 --- a/lua/plugins/editor.lua +++ b/lua/plugins/editor.lua @@ -13,7 +13,7 @@ return { "godlygeek/tabular", "tpope/vim-sleuth", "norcalli/nvim-colorizer.lua", - "ixru/nvim-markdown", + { "ixru/nvim-markdown", ft = "markdown" }, "KeitaNakamura/tex-conceal.vim", "skywind3000/asyncrun.vim", "airblade/vim-gitgutter",