From b41eefca4b53e09054c5596e0fcbbe614bfc7f91 Mon Sep 17 00:00:00 2001 From: zack Date: Mon, 22 Jul 2024 13:34:52 -0400 Subject: [PATCH] 846 current 2024-07-22 13:34:51 24.11.20240722.176e4e9 6.9.8-zen1 * --- flake.lock | 8 +-- .../tools/neovim/config/lua/lsp/handlers.lua | 66 ++++++++++++++++++- .../config/lua/plugins/tools/nvim-java.lua | 1 - 3 files changed, 69 insertions(+), 6 deletions(-) delete mode 100644 modules/home/apps/tools/neovim/config/lua/plugins/tools/nvim-java.lua diff --git a/flake.lock b/flake.lock index 3608b0f..b5030a3 100644 --- a/flake.lock +++ b/flake.lock @@ -654,11 +654,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1721665324, - "narHash": "sha256-2nvbWAhEL7lgBblMwuJIED66irHzmpz61Voj4uPOfNQ=", + "lastModified": 1721668777, + "narHash": "sha256-Xuatew0l9N0igaCenjrN83H6/VqqHtMt3YUQR56wFhc=", "ref": "refs/heads/main", - "rev": "158c1e95ce0aa4590cf0ce3ef3ded8e9c2439b37", - "revCount": 4960, + "rev": "4c3b03516209a49244a8f044143c1162752b8a7a", + "revCount": 4961, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" diff --git a/modules/home/apps/tools/neovim/config/lua/lsp/handlers.lua b/modules/home/apps/tools/neovim/config/lua/lsp/handlers.lua index d905d1e..d2f15ee 100644 --- a/modules/home/apps/tools/neovim/config/lua/lsp/handlers.lua +++ b/modules/home/apps/tools/neovim/config/lua/lsp/handlers.lua @@ -31,7 +31,71 @@ M.lua_ls = make_config("lua_ls", { M.nil_ls = make_config("nixd", {}) -M.jdtls = make_config("jdtls", {}) +M.jdtls = make_config("jdtls", { + settings = { + java = { + signatureHelp = { enabled = true }, + configuration = { + updateBuildConfiguration = "interactive", + -- runtimes = { + -- { + -- name = "JavaSE-11", + -- path = "/usr/lib/jvm/java-11-openjdk/", + -- default = true + -- }, + -- -- { + -- -- name = "JavaSE-17", + -- -- path = "/usr/lib/jvm/java-17-openjdk/", + -- -- }, + -- }, + }, + + eclipse = { + downloadSources = true, + }, + maven = { + downloadSources = true, + }, + implementationsCodeLens = { + enabled = true, + }, + referencesCodeLens = { + enabled = true, + }, + references = { + includeDecompiledSources = true, + }, + inlayHints = { + parameterNames = { + enabled = "all", -- literals, all, none + }, + }, + completion = { + favoriteStaticMembers = { + "org.hamcrest.MatcherAssert.assertThat", + "org.hamcrest.Matchers.*", + "org.hamcrest.CoreMatchers.*", + "org.junit.jupiter.api.Assertions.*", + "java.util.Objects.requireNonNull", + "java.util.Objects.requireNonNullElse", + "org.mockito.Mockito.*", + }, + }, + sources = { + organizeImports = { + starThreshold = 9999, + staticStarThreshold = 9999, + }, + }, + codeGeneration = { + toString = { + template = "${object.className}{${member.name()}=${member.value}, ${otherMembers}}", + }, + useBlocks = true, + }, + }, + }, +}) M.cssls = make_config("cssls", { settings = { diff --git a/modules/home/apps/tools/neovim/config/lua/plugins/tools/nvim-java.lua b/modules/home/apps/tools/neovim/config/lua/plugins/tools/nvim-java.lua deleted file mode 100644 index d23d727..0000000 --- a/modules/home/apps/tools/neovim/config/lua/plugins/tools/nvim-java.lua +++ /dev/null @@ -1 +0,0 @@ -return { "nvim-java/nvim-java" }