diff options
| -rw-r--r-- | lazy-lock.json | 4 | ||||
| -rw-r--r-- | lua/plugins/jdtls.lua | 19 | ||||
| -rw-r--r-- | lua/plugins/spring-boot.lua | 15 |
3 files changed, 23 insertions, 15 deletions
diff --git a/lazy-lock.json b/lazy-lock.json index 431f4df..576f41f 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -32,12 +32,12 @@ "nvim-lint": { "branch": "master", "commit": "9da1fb942dd0668d5182f9c8dee801b9c190e2bb" }, "nvim-lspconfig": { "branch": "master", "commit": "a9b2fb560c4ab22c10728fd5149dbd7b62aa4f69" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, - "nvim-treesitter": { "branch": "main", "commit": "738d9ced4ce5b4538c3a0e23ceca12c34c8d2e74" }, + "nvim-treesitter": { "branch": "main", "commit": "645f42e85d8665c91a9911c3896afb57d6b8a923" }, "nvim-treesitter-textobjects": { "branch": "main", "commit": "1b2d85d3de6114c4bcea89ffb2cd1ce9e3a19931" }, "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, "persistence.nvim": { "branch": "main", "commit": "51eef57272742b773468949f6bd0503ec3f83874" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, - "snacks.nvim": { "branch": "main", "commit": "ecde81fc0ce7c4834def0ce710dd5dc62b0822fc" }, + "snacks.nvim": { "branch": "main", "commit": "9eafe00070532040b5f13e78090c0861ae7fa38c" }, "spring-boot.nvim": { "branch": "main", "commit": "dff5fc9ff38dc60514caf95d57b0dbcd4da9028a" }, "todo-comments.nvim": { "branch": "main", "commit": "19d461ddd543e938eb22505fb03fa878800270b6" }, "tokyonight.nvim": { "branch": "main", "commit": "4fe1b0c44f5d6ee769cdfbdffc7ccb703f53feda" }, diff --git a/lua/plugins/jdtls.lua b/lua/plugins/jdtls.lua new file mode 100644 index 0000000..49ab729 --- /dev/null +++ b/lua/plugins/jdtls.lua @@ -0,0 +1,19 @@ +return { + "mfussenegger/nvim-jdtls", + optional = true, + opts = { + jdtls = function(config) + if not vim.g.user_is_termux then + config.cmd = vim.list_extend(vim.deepcopy(config.cmd), { + "--jvm-arg=-Xms8g", + "--jvm-arg=-Xmx16g", + }) + end + if LazyVim.has("spring-boot.nvim") then + config.init_options = config.init_options or {} + config.init_options.bundles = + vim.list_extend(vim.deepcopy(config.init_options.bundles or {}), require("spring_boot").java_extensions()) + end + end, + }, +} diff --git a/lua/plugins/spring-boot.lua b/lua/plugins/spring-boot.lua index fba79d3..217115f 100644 --- a/lua/plugins/spring-boot.lua +++ b/lua/plugins/spring-boot.lua @@ -1,17 +1,6 @@ return { "JavaHello/spring-boot.nvim", ft = { "java", "yaml", "properties" }, - dependencies = { - "neovim/nvim-lspconfig", - }, - opts = function() - -- Add global command handlers - require("spring_boot").init_lsp_commands() - -- Add spring-boot jdtls extension jars - require("lspconfig").jdtls.setup({ - init_options = { - bundles = require("spring_boot").java_extensions(), - }, - }) - end, + ---@type bootls.Config|{} + opts = {}, } |