stable java

pull/1708/head
Oluwatobi 9 months ago
parent 44570ee8a7
commit c1bde2c691

@ -12,7 +12,7 @@ lsp.ensure_installed {
-- 'ruff_lsp',
'pyright',
-- Java Stuffs
-- 'jdtls',
'jdtls',
-- 'google-java-format',
-- Golang
-- 'gofumpt',
@ -29,6 +29,12 @@ lsp.ensure_installed {
'tailwindcss',
}
local capabilities = vim.lsp.protocol.make_client_capabilities()
capabilities.textDocument.foldingRange = {
dynamicRegistration = false,
lineFoldingOnly = true,
}
-- Fix Undefined global 'vim'
lsp.nvim_workspace()
@ -58,67 +64,71 @@ lsp.set_preferences {
},
}
lsp.on_attach(function(_, bufnr)
local function on_attach(client, bufnr)
local opts = { buffer = bufnr, remap = false }
vim.keymap.set('n', 'gD', function()
vim.lsp.buf.declaration()
end, opts)
vim.keymap.set('n', 'K', function()
vim.lsp.buf.hover()
end, opts)
vim.keymap.set('n', '<leader>vws', function()
vim.lsp.buf.workspace_symbol()
end, opts)
vim.keymap.set('n', '<leader>vd', function()
vim.diagnostic.open_float()
end, opts)
vim.keymap.set('n', '[d', function()
vim.diagnostic.goto_next()
end, opts)
vim.keymap.set('n', ']d', function()
vim.diagnostic.goto_prev()
vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts)
vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts)
vim.keymap.set('n', '<leader>vws', vim.lsp.buf.workspace_symbol, opts)
vim.keymap.set('n', '<leader>vd', vim.diagnostic.open_float, opts)
vim.keymap.set('n', '[d', vim.diagnostic.goto_next, opts)
vim.keymap.set('n', ']d', vim.diagnostic.goto_prev, opts)
vim.keymap.set('n', '<leader>dd', vim.diagnostic.setloclist, opts)
vim.keymap.set('n', '<leader>do', vim.diagnostic.open_float, opts)
vim.keymap.set('n', '<leader>ca', vim.lsp.buf.code_action, opts)
vim.keymap.set('n', 'gd', require('telescope.builtin').lsp_definitions, opts)
vim.keymap.set('n', 'gr', require('telescope.builtin').lsp_references, opts)
vim.keymap.set('n', '<leader>rn', vim.lsp.buf.rename, opts)
vim.keymap.set('n', '<leader>lf', function()
require('conform').format()
end, { buffer = bufnr, desc = 'Format Buffer' })
vim.keymap.set('n', '<leader>wa', vim.lsp.buf.add_workspace_folder, opts)
vim.keymap.set('n', '<leader>wr', vim.lsp.buf.remove_workspace_folder, opts)
vim.keymap.set('n', '<leader>wl', function()
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
end, opts)
end
vim.keymap.set('n', '<leader>dd', function()
vim.diagnostic.setloclist()
end, opts)
lsp.on_attach(on_attach)
lsp.setup()
vim.keymap.set('n', '<leader>do', function()
vim.diagnostic.open_float()
end, opts)
vim.diagnostic.config {
virtual_text = true,
}
vim.keymap.set('n', '<leader>ca', function()
vim.lsp.buf.code_action()
end, opts)
local function on_attach(client, bufnr)
local opts = { buffer = bufnr, remap = false }
vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts)
vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts)
vim.keymap.set('n', '<leader>vws', vim.lsp.buf.workspace_symbol, opts)
vim.keymap.set('n', '<leader>vd', vim.diagnostic.open_float, opts)
vim.keymap.set('n', '[d', vim.diagnostic.goto_next, opts)
vim.keymap.set('n', ']d', vim.diagnostic.goto_prev, opts)
vim.keymap.set('n', '<leader>dd', vim.diagnostic.setloclist, opts)
vim.keymap.set('n', '<leader>do', vim.diagnostic.open_float, opts)
vim.keymap.set('n', '<leader>ca', vim.lsp.buf.code_action, opts)
vim.keymap.set('n', 'gd', require('telescope.builtin').lsp_definitions, opts)
vim.keymap.set('n', 'gr', require('telescope.builtin').lsp_references, opts)
vim.keymap.set('n', '<leader>rn', function()
vim.lsp.buf.rename()
end, opts)
vim.keymap.set('n', '<leader>rn', vim.lsp.buf.rename, opts)
vim.keymap.set('n', '<leader>lf', function()
require('conform').format()
end, { desc = 'Format Buffer' })
-- Add WorkSpace
end, { buffer = bufnr, desc = 'Format Buffer' })
vim.keymap.set('n', '<leader>wa', vim.lsp.buf.add_workspace_folder, opts)
-- Remove WorkSpace
vim.keymap.set('n', '<leader>wr', vim.lsp.buf.remove_workspace_folder, opts)
-- List WorkSpace
vim.keymap.set('n', '<leader>wl', function()
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
end, opts)
end)
end
lsp.on_attach(on_attach)
lsp.setup()
vim.diagnostic.config {
virtual_text = true,
}
return {
capabilities = capabilities,
on_attach = on_attach,
}

@ -1,14 +1,49 @@
local java_21_home_dir = '/Library/Java/JavaVirtualMachines/openjdk.jdk/Contents/Home/bin/java'
local java_21_home_dir = '/Library/Java/JavaVirtualMachines/openjdk.jdk/Contents/Home'
local java_17_home_dir = '/Library/Java/JavaVirtualMachines/zulu-17.jdk/Contents/Home'
local java_11_home_dir = '/Library/Java/JavaVirtualMachines/zulu-11.jdk/Contents/Home'
local function on_attach(client, bufnr)
local opts = { buffer = bufnr, remap = false }
vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts)
vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts)
vim.keymap.set('n', '<leader>vws', vim.lsp.buf.workspace_symbol, opts)
vim.keymap.set('n', '<leader>vd', vim.diagnostic.open_float, opts)
vim.keymap.set('n', '[d', vim.diagnostic.goto_next, opts)
vim.keymap.set('n', ']d', vim.diagnostic.goto_prev, opts)
vim.keymap.set('n', '<leader>dd', vim.diagnostic.setloclist, opts)
vim.keymap.set('n', '<leader>do', vim.diagnostic.open_float, opts)
vim.keymap.set('n', '<leader>ca', vim.lsp.buf.code_action, opts)
vim.keymap.set('n', 'gd', require('telescope.builtin').lsp_definitions, opts)
vim.keymap.set('n', 'gr', require('telescope.builtin').lsp_references, opts)
vim.keymap.set('n', '<leader>rn', vim.lsp.buf.rename, opts)
vim.keymap.set('n', '<leader>lf', function()
require('conform').format()
end, { buffer = bufnr, desc = 'Format Buffer' })
vim.keymap.set('n', '<leader>wa', vim.lsp.buf.add_workspace_folder, opts)
vim.keymap.set('n', '<leader>wr', vim.lsp.buf.remove_workspace_folder, opts)
vim.keymap.set('n', '<leader>wl', function()
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
end, opts)
end
local capabilities = vim.lsp.protocol.make_client_capabilities()
capabilities.textDocument.foldingRange = {
dynamicRegistration = false,
lineFoldingOnly = true,
}
require('java').setup()
require('lspconfig').jdtls.setup {
on_attach = on_attach,
capabilities = capabilities,
settings = {
java = {
configuration = {
runtimes = {
{
name = 'JavaSE-21',
path = java_21_home_dir .. '/bin/java',
name = 'JavaSE-17',
path = java_17_home_dir .. '/bin/java',
default = true,
},
},
@ -34,3 +69,7 @@ vim.keymap.set('n', '<leader>jd', function()
vim.notify 'This keymap only works for Java files.'
end
end, { desc = 'Redeploy Wildfly' })
vim.diagnostic.config {
virtual_text = true,
}

@ -8,10 +8,8 @@ vim.keymap.set('n', 'zR', require('ufo').openAllFolds)
vim.keymap.set('n', 'zM', require('ufo').closeAllFolds)
vim.keymap.set('n', 'zK', function()
local winid = require('ufo').peekFoldedLinesUnderCursor()
local winid = ufo.peekFoldedLinesUnderCursor()
if not winid then
-- choose one of coc.nvim and nvim lsp
-- vim.fn.CocActionAsync 'definitionHover' -- coc.nvim
vim.lsp.buf.hover()
end
end)
@ -22,15 +20,6 @@ capabilities.textDocument.foldingRange = {
lineFoldingOnly = true,
}
-- local language_servers = require('lspconfig').util.available_servers() -- or list servers manually like {'gopls', 'clangd'}
-- print(language_servers)
-- for _, ls in ipairs(language_servers) do
-- require('lspconfig')[ls].setup {
-- capabilities = capabilities,
-- -- you can add other fields for setting up lsp server in this table
-- }
-- end
require('ufo').setup {
provider_selector = function(bufnr, filetype, buftype)
return { 'lsp', 'indent' }

@ -0,0 +1,176 @@
-- Java Language Server configuration.
-- Locations:
-- 'nvim/ftplugin/java.lua'.
-- 'nvim/lang-servers/intellij-java-google-style.xml'
-- local jdtls_ok, jdtls = pcall(require, 'jdtls')
-- if not jdtls_ok then
-- vim.notify 'JDTLS not found, install with `:LspInstall jdtls`'
-- return
-- end
local home = os.getenv 'HOME'
local jdtls = require 'jdtls'
-- vim.notify 'Home: ' .. home
-- See `:help vim.lsp.start_client` for an overview of the supported `config` options.
-- local jdtls_path = vim.fn.stdpath 'data' .. '/mason/packages/jdtls'
local jdtls_path = home .. '/.local/share/nvim/mason/packages/jdtls'
local path_to_lsp_server = jdtls_path .. '/config_mac'
local path_to_plugins = jdtls_path .. '/plugins/'
local path_to_jar = path_to_plugins .. 'org.eclipse.equinox.launcher_1.6.900.v20240613-2009.jar'
local lombok_path = jdtls_path .. '/lombok.jar'
local styling = home .. '/.local/share/java/eclipse-java-google-style.xml'
print(lombok_path)
local root_markers = { '.git', 'mvnw', 'gradlew', 'pom.xml', 'build.gradle' }
local root_dir = require('jdtls.setup').find_root(root_markers)
if root_dir == '' then
return
end
local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ':p:h:t')
local workspace_dir = vim.fn.stdpath 'data' .. '/site/java/workspace-root/' .. project_name
os.execute('mkdir ' .. workspace_dir)
local java_21_home_dir = '/Library/Java/JavaVirtualMachines/openjdk.jdk/Contents/Home'
local java_17_home_dir = '/Library/Java/JavaVirtualMachines/zulu-17.jdk/Contents/Home'
local java_11_home_dir = '/Library/Java/JavaVirtualMachines/zulu-11.jdk/Contents/Home'
-- Main Config
local config = {
-- The command that starts the language server
-- See: https://github.com/eclipse/eclipse.jdt.ls#running-from-the-command-line
cmd = {
java_21_home_dir .. '/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',
'-Xmx1g',
'-Dlog.level=ALL',
'--add-modules=ALL-SYSTEM',
'--add-opens',
'java.base/java.util=ALL-UNNAMED',
'--add-opens',
'java.base/java.lang=ALL-UNNAMED',
'-javaagent:' .. lombok_path,
'-Xms1g',
'--add-modules=ALL-SYSTEM',
'--add-opens',
'java.base/java.util=ALL-UNNAMED',
'--add-opens',
'java.base/java.lang=ALL-UNNAMED',
'-jar',
path_to_jar,
'-configuration',
path_to_lsp_server,
'-data',
workspace_dir,
},
-- This is the default if not provided, you can remove it. Or adjust as needed.
-- One dedicated LSP server & client will be started per unique root_dir
root_dir = root_dir,
settings = {
java = {
home = java_21_home_dir,
eclipse = {
downloadSources = true,
},
configuration = {
updateBuildConfiguration = 'interactive',
runtimes = {
{
name = 'JavaSE-21',
path = java_21_home_dir,
},
{
name = 'JavaSE-11',
path = java_11_home_dir,
},
{
name = 'JavaSE-17',
path = java_17_home_dir,
},
},
},
maven = {
downloadSources = true,
},
implementationsCodeLens = {
enabled = true,
},
referencesCodeLens = {
enabled = true,
},
references = {
includeDecompiledSources = true,
},
format = {
settings = {
url = styling,
profile = 'GoogleStyle',
},
},
},
signatureHelp = { enabled = true },
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.*',
},
importOrder = {
'java',
'com',
'org',
'javax',
'jarkata',
},
},
sources = {
organizeImports = {
starThreshold = 9999,
staticStarThreshold = 9999,
},
},
codeGeneration = {
toString = {
template = '${object.className}{${member.name()}=${member.value}, ${otherMembers}}',
},
useBlocks = true,
},
},
flags = {
allow_incremental_sync = true,
},
init_options = {
bundles = {
vim.fn.glob(lombok_path, 1),
},
},
}
-- config['on_attach'] = function(_, bufnr)
-- require('keymaps').map_java_keys(bufnr)
-- require('lsp_signature').on_attach({
-- bind = true, -- This is mandatory, otherwise border config won't get registered.
-- floating_window_above_cur_line = false,
-- padding = '',
-- handler_opts = {
-- border = 'rounded',
-- },
-- }, bufnr)
-- end
-- This starts a new client & server,
-- or attaches to an existing client & server depending on the `root_dir`.
require('jdtls').start_or_attach(config)

@ -3,25 +3,19 @@
-- 'nvim/ftplugin/java.lua'.
-- 'nvim/lang-servers/intellij-java-google-style.xml'
-- local jdtls_ok, jdtls = pcall(require, 'jdtls')
-- if not jdtls_ok then
-- vim.notify 'JDTLS not found, install with `:LspInstall jdtls`'
-- return
-- end
local home = os.getenv 'HOME'
local jdtls = require 'jdtls'
-- vim.notify 'Home: ' .. home
local jdtls_ok, jdtls = pcall(require, 'jdtls')
if not jdtls_ok then
vim.notify 'JDTLS not found, install with `:LspInstall jdtls`'
return
end
-- See `:help vim.lsp.start_client` for an overview of the supported `config` options.
-- local jdtls_path = vim.fn.stdpath 'data' .. '/mason/packages/jdtls'
local jdtls_path = home .. '/.local/share/nvim/mason/packages/jdtls'
local jdtls_path = '/Users/oluwatobibello/.local/share/nvim/mason/packages/jdtls'
local path_to_lsp_server = jdtls_path .. '/config_mac'
local path_to_plugins = jdtls_path .. '/plugins/'
local path_to_jar = path_to_plugins .. 'org.eclipse.equinox.launcher_1.6.900.v20240613-2009.jar'
local lombok_path = jdtls_path .. '/lombok.jar'
local styling = home .. '/.local/share/java/eclipse-java-google-style.xml'
print(lombok_path)
local path_to_jar = path_to_plugins .. 'org.eclipse.equinox.launcher_*.jar'
local lombok_path = path_to_plugins .. 'lombok.jar'
local root_markers = { '.git', 'mvnw', 'gradlew', 'pom.xml', 'build.gradle' }
local root_dir = require('jdtls.setup').find_root(root_markers)
@ -33,7 +27,7 @@ local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ':p:h:t')
local workspace_dir = vim.fn.stdpath 'data' .. '/site/java/workspace-root/' .. project_name
os.execute('mkdir ' .. workspace_dir)
local java_21_home_dir = '/Library/Java/JavaVirtualMachines/openjdk.jdk/Contents/Home'
local java_21_home_dir = '/Library/Java/JavaVirtualMachines/openjdk.jdk/Contents/Home/bin/java'
local java_17_home_dir = '/Library/Java/JavaVirtualMachines/zulu-17.jdk/Contents/Home'
local java_11_home_dir = '/Library/Java/JavaVirtualMachines/zulu-11.jdk/Contents/Home'
@ -74,6 +68,9 @@ local config = {
-- One dedicated LSP server & client will be started per unique root_dir
root_dir = root_dir,
-- Here you can configure eclipse.jdt.ls specific settings
-- See https://github.com/eclipse/eclipse.jdt.ls/wiki/Running-the-JAVA-LS-server-from-the-command-line#initialize-request
-- for a list of options
settings = {
java = {
home = java_21_home_dir,
@ -109,12 +106,6 @@ local config = {
references = {
includeDecompiledSources = true,
},
format = {
settings = {
url = styling,
profile = 'GoogleStyle',
},
},
},
signatureHelp = { enabled = true },
completion = {
@ -153,23 +144,21 @@ local config = {
allow_incremental_sync = true,
},
init_options = {
bundles = {
vim.fn.glob(lombok_path, 1),
},
bundles = {},
},
}
-- config['on_attach'] = function(_, bufnr)
-- require('keymaps').map_java_keys(bufnr)
-- require('lsp_signature').on_attach({
-- bind = true, -- This is mandatory, otherwise border config won't get registered.
-- floating_window_above_cur_line = false,
-- padding = '',
-- handler_opts = {
-- border = 'rounded',
-- },
-- }, bufnr)
-- end
config['on_attach'] = function(_, bufnr)
require('keymaps').map_java_keys(bufnr)
require('lsp_signature').on_attach({
bind = true, -- This is mandatory, otherwise border config won't get registered.
floating_window_above_cur_line = false,
padding = '',
handler_opts = {
border = 'rounded',
},
}, bufnr)
end
-- This starts a new client & server,
-- or attaches to an existing client & server depending on the `root_dir`.

Loading…
Cancel
Save