mirror of
https://github.com/LazyVim/LazyVim.git
synced 2025-06-21 16:39:06 +02:00
feat(java): new java mappings format for which-key v3 (#4013)
## Description Use which-key v3 format for java mappings. `<leader>c` is removed as it is reported as a duplicate mapping in health check. ## Related Issue(s) ## Screenshots ## Checklist - [x] I've read the [CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md) guidelines.
This commit is contained in:
parent
406aa9d8b4
commit
28a7f8126c
1 changed files with 57 additions and 41 deletions
|
@ -190,30 +190,40 @@ return {
|
||||||
local client = vim.lsp.get_client_by_id(args.data.client_id)
|
local client = vim.lsp.get_client_by_id(args.data.client_id)
|
||||||
if client and client.name == "jdtls" then
|
if client and client.name == "jdtls" then
|
||||||
local wk = require("which-key")
|
local wk = require("which-key")
|
||||||
wk.register({
|
wk.add({
|
||||||
["<leader>cx"] = { name = "+extract" },
|
{
|
||||||
["<leader>cxv"] = { require("jdtls").extract_variable_all, "Extract Variable" },
|
mode = "n",
|
||||||
["<leader>cxc"] = { require("jdtls").extract_constant, "Extract Constant" },
|
buffer = args.buf,
|
||||||
["gs"] = { require("jdtls").super_implementation, "Goto Super" },
|
{ "<leader>cx", group = "extract" },
|
||||||
["gS"] = { require("jdtls.tests").goto_subjects, "Goto Subjects" },
|
{ "<leader>cxv", require("jdtls").extract_variable_all, desc = "Extract Variable" },
|
||||||
["<leader>co"] = { require("jdtls").organize_imports, "Organize Imports" },
|
{ "<leader>cxc", require("jdtls").extract_constant, desc = "Extract Constant" },
|
||||||
}, { mode = "n", buffer = args.buf })
|
{ "gs", require("jdtls").super_implementation, desc = "Goto Super" },
|
||||||
wk.register({
|
{ "gS", require("jdtls.tests").goto_subjects, desc = "Goto Subjects" },
|
||||||
["<leader>c"] = { name = "+code" },
|
{ "<leader>co", require("jdtls").organize_imports, desc = "Organize Imports" },
|
||||||
["<leader>cx"] = { name = "+extract" },
|
|
||||||
["<leader>cxm"] = {
|
|
||||||
[[<ESC><CMD>lua require('jdtls').extract_method(true)<CR>]],
|
|
||||||
"Extract Method",
|
|
||||||
},
|
},
|
||||||
["<leader>cxv"] = {
|
})
|
||||||
[[<ESC><CMD>lua require('jdtls').extract_variable_all(true)<CR>]],
|
wk.add({
|
||||||
"Extract Variable",
|
{
|
||||||
|
mode = "v",
|
||||||
|
buffer = args.buf,
|
||||||
|
{ "<leader>cx", group = "extract" },
|
||||||
|
{
|
||||||
|
"<leader>cxm",
|
||||||
|
[[<ESC><CMD>lua require('jdtls').extract_method(true)<CR>]],
|
||||||
|
desc = "Extract Method",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"<leader>cxv",
|
||||||
|
[[<ESC><CMD>lua require('jdtls').extract_variable_all(true)<CR>]],
|
||||||
|
desc = "Extract Variable",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"<leader>cxc",
|
||||||
|
[[<ESC><CMD>lua require('jdtls').extract_constant(true)<CR>]],
|
||||||
|
desc = "Extract Constant",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
["<leader>cxc"] = {
|
})
|
||||||
[[<ESC><CMD>lua require('jdtls').extract_constant(true)<CR>]],
|
|
||||||
"Extract Constant",
|
|
||||||
},
|
|
||||||
}, { mode = "v", buffer = args.buf })
|
|
||||||
|
|
||||||
if opts.dap and LazyVim.has("nvim-dap") and mason_registry.is_installed("java-debug-adapter") then
|
if opts.dap and LazyVim.has("nvim-dap") and mason_registry.is_installed("java-debug-adapter") then
|
||||||
-- custom init for Java debugger
|
-- custom init for Java debugger
|
||||||
|
@ -223,26 +233,32 @@ return {
|
||||||
-- Java Test require Java debugger to work
|
-- Java Test require Java debugger to work
|
||||||
if opts.test and mason_registry.is_installed("java-test") then
|
if opts.test and mason_registry.is_installed("java-test") then
|
||||||
-- custom keymaps for Java test runner (not yet compatible with neotest)
|
-- custom keymaps for Java test runner (not yet compatible with neotest)
|
||||||
wk.register({
|
wk.add({
|
||||||
["<leader>t"] = { name = "+test" },
|
{
|
||||||
["<leader>tt"] = {
|
mode = "n",
|
||||||
function()
|
buffer = args.buf,
|
||||||
require("jdtls.dap").test_class({
|
{ "<leader>t", group = "test" },
|
||||||
config_overrides = type(opts.test) ~= "boolean" and opts.test.config_overrides or nil,
|
{
|
||||||
})
|
"<leader>tt",
|
||||||
end,
|
function()
|
||||||
"Run All Test",
|
require("jdtls.dap").test_class({
|
||||||
|
config_overrides = type(opts.test) ~= "boolean" and opts.test.config_overrides or nil,
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
desc = "Run All Test",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"<leader>tr",
|
||||||
|
function()
|
||||||
|
require("jdtls.dap").test_nearest_method({
|
||||||
|
config_overrides = type(opts.test) ~= "boolean" and opts.test.config_overrides or nil,
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
desc = "Run Nearest Test",
|
||||||
|
},
|
||||||
|
{ "<leader>tT", require("jdtls.dap").pick_test, desc = "Run Test" },
|
||||||
},
|
},
|
||||||
["<leader>tr"] = {
|
})
|
||||||
function()
|
|
||||||
require("jdtls.dap").test_nearest_method({
|
|
||||||
config_overrides = type(opts.test) ~= "boolean" and opts.test.config_overrides or nil,
|
|
||||||
})
|
|
||||||
end,
|
|
||||||
"Run Nearest Test",
|
|
||||||
},
|
|
||||||
["<leader>tT"] = { require("jdtls.dap").pick_test, "Run Test" },
|
|
||||||
}, { mode = "n", buffer = args.buf })
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue