From fd17e59493da4e90a1c4e0563b4626f377da5804 Mon Sep 17 00:00:00 2001 From: "Anthony D. Mays" Date: Fri, 23 Feb 2024 08:28:38 -0800 Subject: [PATCH 1/3] updating doco and installer Signed-off-by: Anthony D. Mays --- README.md | 22 +++++----------------- installer/install.ps1 | 2 +- installer/install.sh | 2 +- 3 files changed, 7 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 26d5c3a7..35a3e98f 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@
-![Last commit](https://img.shields.io/github/last-commit/Alexis12119/nvim-config?style=for-the-badge&logo=git&color=000F10&logoColor=dark%20orange&labelColor=302D41) +![Last commit](https://img.shields.io/github/last-commit/anthonydmays/nvim-config?style=for-the-badge&logo=git&color=000F10&logoColor=dark%20orange&labelColor=302D41) [![](https://img.shields.io/badge/Neovim-0.9+-blueviolet.svg?style=for-the-badge&color=000F10&logo=Neovim&logoColor=green&labelColor=302D41)](https://github.com/neovim/neovim) -![Preview](https://github.com/Alexis12119/nvim-config/assets/74944536/c6a3225a-eb52-4c21-bd9d-12a689173a0f) +![Preview](https://github.com/anthonydmays/nvim-config/assets/74944536/c6a3225a-eb52-4c21-bd9d-12a689173a0f)
@@ -53,12 +53,12 @@ Please follow these steps: - On Linux/MacOS: ```sh - bash <(curl -s https://raw.githubusercontent.com/Alexis12119/nvim-config/main/installer/install.sh) + bash <(curl -s https://raw.githubusercontent.com/anthonydmays/nvim-config/main/installer/install.sh) ``` - On Windows (Powershell): ```ps1 - Invoke-WebRequest https://raw.githubusercontent.com/Alexis12119/nvim-config/main/installer/install.ps1 -UseBasicParsing | Invoke-Expression + Invoke-WebRequest https://raw.githubusercontent.com/anthonydmays/nvim-config/main/installer/install.ps1 -UseBasicParsing | Invoke-Expression ``` ## ✨ Features @@ -81,20 +81,8 @@ Please follow these steps: - **Keymap Cheatsheet**: Quickly reference keymaps with [which-key.nvim](https://github.com/folke/which-key.nvim). - **Markdown Preview**: Preview your Markdown files with [markdown-preview.nvim](https://github.com/iamcco/markdown-preview.nvim). -## 🌟 Stargazers - -I appreciate the support from all the Stargazers! - -[![Stargazers](http://reporoster.com/stars/dark/notext/Alexis12119/nvim-config)](https://github.com/Alexis12119/nvim-config/stargazers) - ### CREDITS -This Neovim configuration is built upon the foundation of NvChad. Special thanks to the NvChad community and developers for their fantastic work. - -- [NvChad](https://github.com/NvChad/NvChad) - -> “Make it work, make it right, make it fast.” - -\- Kent Beck +Thanks to @Alexis12119 for the excellent starting setup! Checkout the original repo at [Alexis12119/nvim-config](https://github.com/Alexis12119/nvim-config). --- diff --git a/installer/install.ps1 b/installer/install.ps1 index 8a709c1d..48ff14ec 100644 --- a/installer/install.ps1 +++ b/installer/install.ps1 @@ -18,7 +18,7 @@ function Clone-Repository { # Main script $NvChadRepo = "https://github.com/NvChad/NvChad.git" $NvChadConfig = "$env:LOCALAPPDATA\nvim" -$ConfigRepo = "https://github.com/Alexis12119/nvim-config.git" +$ConfigRepo = "https://github.com/anthonydmays/nvim-config.git" $ConfigPlugins = "$env:LOCALAPPDATA\nvim-data\lazy" # Check if a Neovim configuration already exists diff --git a/installer/install.sh b/installer/install.sh index d048d602..e012dcdc 100755 --- a/installer/install.sh +++ b/installer/install.sh @@ -3,7 +3,7 @@ config_dir="$HOME/.config/nvim" config_plugins="$HOME/.local/share/nvim/lazy" nvchad_repo="https://github.com/NvChad/NvChad.git" -config_repo="https://github.com/Alexis12119/nvim-config.git" +config_repo="https://github.com/anthonydmays/nvim-config.git" # Function to clone a Git repository with error handling clone_repository() { From a0f340fa73d2272e617a4745ba71f0170336a399 Mon Sep 17 00:00:00 2001 From: "Anthony D. Mays" Date: Fri, 23 Feb 2024 08:41:17 -0800 Subject: [PATCH 2/3] feat: enables working java test debugging Signed-off-by: Anthony D. Mays --- core/autocommands.lua | 13 ++++++++++--- plugins/dap/settings/java-debug.lua | 10 ++++++++++ plugins/lsp/init.lua | 6 ++++++ 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/core/autocommands.lua b/core/autocommands.lua index 991a1c24..fe0ae5fa 100644 --- a/core/autocommands.lua +++ b/core/autocommands.lua @@ -174,7 +174,14 @@ autocmd("FileType", { local bufnr = vim.api.nvim_get_current_buf() local java_debug_path = vim.fn.stdpath "data" .. "/mason/packages/java-debug-adapter/" + local java_test_path = vim.fn.stdpath "data" .. "/mason/packages/java-test/" local jdtls_path = vim.fn.stdpath "data" .. "/mason/packages/jdtls/" + + local bundles = { + vim.fn.glob(java_debug_path .. "extension/server/com.microsoft.java.debug.plugin-*.jar", 1), + }; + vim.list_extend(bundles, vim.split(vim.fn.glob(java_test_path .. "extension/server/*.jar", 1), "\n")) + -- NOTE: Decrease the amount of files to improve speed(Experimental). -- INFO: It's annoying to edit the version again and again. local equinox_path = vim.split(vim.fn.glob(vim.fn.stdpath "data" .. "/mason/packages/jdtls/plugins/*jar"), "\n") @@ -245,9 +252,7 @@ autocmd("FileType", { -- One dedicated LSP server & client will be started per unique root_dir root_dir = require("jdtls.setup").find_root(root_markers), init_options = { - bundles = { - vim.fn.glob(java_debug_path .. "extension/server/com.microsoft.java.debug.plugin-*.jar", 1), - }, + bundles = bundles, }, settings = { eclipse = { @@ -296,6 +301,8 @@ autocmd("FileType", { command! -buffer JdtJol lua require('jdtls').jol() command! -buffer JdtBytecode lua require('jdtls').javap() command! -buffer JdtJshell lua require('jdtls').jshell() + command! -buffer JavaTestCurrentClass lua require('jdtls').test_class() + command! -buffer JavaTestNearestMethod lua require('jdtls').test_nearest_method() ]] -- This starts a new client & server, diff --git a/plugins/dap/settings/java-debug.lua b/plugins/dap/settings/java-debug.lua index 516fdb76..21462466 100644 --- a/plugins/dap/settings/java-debug.lua +++ b/plugins/dap/settings/java-debug.lua @@ -2,6 +2,16 @@ local dap = require "dap" dap.configurations.java = { { + name = "Launch Java", javaExec = "java", + request = "launch", + type = "java", + }, + { + type = 'java', + request = 'attach', + name = "Debug (Attach) - Remote", + hostName = "127.0.0.1", + port = 5005, }, } diff --git a/plugins/lsp/init.lua b/plugins/lsp/init.lua index 04024eb2..511bd7fa 100644 --- a/plugins/lsp/init.lua +++ b/plugins/lsp/init.lua @@ -90,6 +90,12 @@ return { require "custom.plugins.lsp.mason" end, }, + opts = { + registries = { + "github:nvim-java/mason-registry", + "github:mason-org/mason-registry", + }, + }, }, -- Improve Other LSP Functionalities { From 8efa90ad413fb91d97678fff38d5e065fa6501ff Mon Sep 17 00:00:00 2001 From: "Anthony D. Mays" Date: Fri, 23 Feb 2024 08:41:57 -0800 Subject: [PATCH 3/3] feat: enables nvim-tree Signed-off-by: Anthony D. Mays --- plugins/nvim-tree.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/nvim-tree.lua b/plugins/nvim-tree.lua index f4c3e7ee..093c2afc 100644 --- a/plugins/nvim-tree.lua +++ b/plugins/nvim-tree.lua @@ -14,6 +14,7 @@ end -- File Explorer return { "nvim-tree/nvim-tree.lua", + enabled = true, init = function() require("core.utils").load_mappings "NvimTree" end,