Skip to content

feat: add spring boot tools support #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
s1n7ax merged 5 commits into from
Jul 5, 2024
Merged

feat: add spring boot tools support #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4d476b5
feat: add spring boot tools to list of loading bundles
s1n7ax Jul 5, 2024
1103ae8
feat: set up spring boot if enabled before lsp config
s1n7ax Jul 5, 2024
fbbb103
feat: add spring boot
s1n7ax Jul 5, 2024
83621dd
fix: spring_boot_tool enable is not checked for bundle loading
s1n7ax Jul 5, 2024
c412d11
Merge branch 'main' into 37-feature-spring-boot-support
s1n7ax Jul 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,10 @@ want, following options are available
enable = true,
},

spring_boot_tools = {
enable = true,
},

jdk = {
-- install jdk using mason.nvim
auto_install = true,
Expand Down
1 change: 1 addition & 0 deletions lazy.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ return {
'MunifTanjim/nui.nvim',
'neovim/nvim-lspconfig',
'mfussenegger/nvim-dap',
'JavaHello/spring-boot.nvim',
{
'williamboman/mason.nvim',
opts = {
Expand Down
5 changes: 5 additions & 0 deletions lua/java/config.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
---@field root_markers string[]
---@field java_test { enable: boolean }
---@field java_debug_adapter { enable: boolean }
---@field spring_boot_tools { enable: boolean }
---@field jdk { auto_install: boolean }
---@field notifications { dap: boolean }
---@field verification { invalid_order: boolean, duplicate_setup_calls: boolean, invalid_mason_registry: boolean }
Expand Down Expand Up @@ -29,6 +30,10 @@ local config = {
enable = true,
},

spring_boot_tools = {
enable = true,
},

jdk = {
-- install jdk using mason.nvim
auto_install = true,
Expand Down
14 changes: 14 additions & 0 deletions lua/java/startup/lspconfig-setup-wrap.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
local lspconfig = require('lspconfig')
local log = require('java.utils.log')
local mason_util = require('java-core.utils.mason')

local server = require('java-core.ls.servers.jdtls')

Expand All @@ -23,12 +24,25 @@ function M.setup(config)
table.insert(jdtls_plugins, 'java-debug-adapter')
end

if config.spring_boot_tools.enable then
table.insert(jdtls_plugins, 'spring-boot-tools')
end

local default_config = server.get_config({
root_markers = config.root_markers,
jdtls_plugins = jdtls_plugins,
use_mason_jdk = config.jdk.auto_install,
})

if config.spring_boot_tools.enable then
require('spring_boot').setup({
ls_path = mason_util.get_pkg_path('spring-boot-tools')
.. '/extension/language-server',
})

require('spring_boot').init_lsp_commands()
end

org_setup(vim.tbl_extend('force', default_config, user_config))
end
end
Expand Down
17 changes: 13 additions & 4 deletions lua/java/startup/mason-dep.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ local async = require('java-core.utils.async')
local lazy = require('java.ui.lazy')
local sync = async.sync

local List = require('java-core.utils.list')

local M = {}

---Install mason package dependencies for nvim-java
Expand Down Expand Up @@ -42,19 +44,26 @@ function M.refresh_and_install(packages)
mason_util.install_pkgs(packages)
end

---Returns a list of dependency packages
---@param config java.Config
---@return table
function M.get_pkg_list(config)
local dependecies = {
local deps = List:new({
{ name = 'jdtls', version = 'v1.31.0' },
{ name = 'lombok-nightly', version = 'nightly' },
{ name = 'java-test', version = '0.40.1' },
{ name = 'java-debug-adapter', version = '0.55.0' },
}
})

if config.jdk.auto_install then
table.insert(dependecies, { name = 'openjdk-17', version = '17.0.2' })
deps:push({ name = 'openjdk-17', version = '17.0.2' })
end

if config.spring_boot_tools.enable then
deps:push({ name = 'spring-boot-tools', version = '1.55.1' })
end

return dependecies
return deps
end

return M