diff --git a/README.md b/README.md index 8942bef..b0bf542 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,7 @@ return { 'nvim-java/lua-async-await', 'nvim-java/nvim-java-core', 'nvim-java/nvim-java-test', + 'nvim-java/nvim-java-dap', 'MunifTanjim/nui.nvim', 'neovim/nvim-lspconfig', 'mfussenegger/nvim-dap', diff --git a/lua/java/startup/mason-dep.lua b/lua/java/startup/mason-dep.lua index 0d1832f..3a6d8ff 100644 --- a/lua/java/startup/mason-dep.lua +++ b/lua/java/startup/mason-dep.lua @@ -3,6 +3,7 @@ local mason_ui = require('mason.ui') local mason_util = require('java.utils.mason') local notify = require('java-core.utils.notify') local async = require('java-core.utils.async') +local lazy = require('java.ui.lazy') local sync = async.sync local M = {} @@ -29,6 +30,10 @@ end function M.refresh_and_install(packages) vim.schedule(function() + -- lazy covers mason + -- https://github.com/nvim-java/nvim-java/issues/51 + lazy.close_lazy_if_opened() + mason_ui.open() notify.warn('Please close and re-open after dependecies are installed') end) diff --git a/lua/java/ui/lazy.lua b/lua/java/ui/lazy.lua new file mode 100644 index 0000000..b88257d --- /dev/null +++ b/lua/java/ui/lazy.lua @@ -0,0 +1,13 @@ +local M = {} + +function M.close_lazy_if_opened() + local ok, view = pcall(require, 'lazy.view') + + if not ok then + return + end + + view.view:hide() +end + +return M