chore: small improvements

- improve Java config w/ jdtls and gradle - improve completion even for usercmd after blink.cmp fix on cmdline - more..
kevinm6 · Feb 1, 2025 · 13d6b29 · 13d6b29
1 parent e3ae399
commit 13d6b29
Show file tree

Hide file tree

Showing 9 changed files with 72 additions and 65 deletions.
diff --git a/.github/workflows/test_on_nightly.yml b/.github/workflows/test_on_nightly.yml
@@ -9,20 +9,20 @@ jobs:
       - name: Install Neovim
         shell: bash
         run: |
-            cd /tmp/
-            wget -q https://github.com/neovim/neovim/releases/download/nightly/nvim-linux64.tar.gz -O /tmp/nvim-linux64.tar.gz
-            tar xzvf nvim-linux64.tar.gz
+          cd /tmp/
+          wget -q https://github.com/neovim/neovim/releases/download/nightly/nvim-linux-x86_64.tar.gz -O /tmp/nvim_linux.tar.gz
+          tar xzvf nvim_linux.tar.gz
       - name: Run Tests
         run: |
-            cd /tmp/
-            ./nvim-linux64/bin/nvim --version
-            [ ! -d tests ] && exit 0
-            ./nvim-linux64/bin/nvim --headless -u tests/init.lua -c "PlenaryBustedDirectory tests/ {minimal_init = 'tests/init.lua', sequential = true}"
+          cd /tmp/
+          ./nvim_linux/bin/nvim --version
+          [ ! -d tests ] && exit 0
+          ./nvim_linux/bin/nvim --headless -u tests/init.lua -c "PlenaryBustedDirectory tests/ {minimal_init = 'tests/init.lua', sequential = true}"
   docs:
-      runs-on: ubuntu-latest
-      needs: tests
-      if: ${{ github.ref == 'refs/heads/main' }}
-      steps:
+    runs-on: ubuntu-latest
+    needs: tests
+    if: ${{ github.ref == 'refs/heads/main' }}
+    steps:
       - uses: actions/checkout@v3
       - name: panvimdoc
         uses: kdheepak/panvimdoc@main
@@ -54,11 +54,11 @@ jobs:
       - uses: actions/checkout@v2
       - name: tag stable versions
         if: ${{ steps.release.outputs.release_created }}
-        run: |
+        run: |-
           git config user.name github-actions[bot]
           git config user.email github-actions[bot]@users.noreply.github.com
           git remote add gh-token "https://${{ secrets.GITHUB_TOKEN }}@github.com/google-github-actions/release-please-action.git"
           git tag -d stable || true
           git push origin :stable || true
           git tag -a stable -m "Last Stable Release"
-          git push origin stable
+          git push origin stable
diff --git a/after/ftplugin/java.lua b/after/ftplugin/java.lua
@@ -20,10 +20,8 @@ extendedClientCapabilities.resolveAdditionalTextEditsSupport = true
 extendedClientCapabilities.document_formatting = false
 
 local root_dir = vim.fs.root(0, { ".git", "mvnw", "gradlew", "pom.xml" })
-  or vim.fs.dirname(vim.api.nvim_buf_get_name(0))
-local cache_dir = vim.fn.stdpath "cache"
-local project_name = vim.fs.basename(root_dir or vim.uv.cwd())
-local workspace_dir = string.format("%s/java/wksp/%s", cache_dir, project_name)
+local project_name = vim.fs.basename(root_dir or vim.fs.dirname(vim.api.nvim_buf_get_name(0)))
+local workspace_dir = string.format("%s/jdtls/wksp/%s", vim.fn.stdpath "cache", project_name)
 
 local launcher_path = vim.fn.glob(data_path .. "/mason/packages/jdtls/plugins/org.eclipse.equinox.launcher_*.jar", true)
 local bundles = vim.fn.glob(
@@ -32,9 +30,6 @@ local bundles = vim.fn.glob(
   true
 )
 
--- Example usage: Run the function with the desired task
--- RunGradleTask('test')
-
 local lombok_path = data_path .. "/mason/packages/jdtls/lombok.jar"
 
 local function get_config_dir()
@@ -51,7 +46,7 @@ local function get_config_dir()
     sys_config = "win"
   end
 
-  return string.format("%s/mason/packages/jdtls/config_%s", vim.fn.stdpath "data", sys_config)
+  return string.format("%s/mason/packages/jdtls/config_%s", data_path, sys_config)
 end
 
 vim.list_extend(
@@ -67,21 +62,19 @@ local config = {
     "-Declipse.product=org.eclipse.jdt.ls.core.product",
     "-Dlog.protocol=true",
     "-Dlog.level=ALL",
+    "-Djava.import.generatesMetadataFilesAtProjectRoot=false",
     "-Xms1g",
     "--add-modules=ALL-SYSTEM",
     "--add-opens",
     "java.base/java.util=ALL-UNNAMED",
     "--add-opens",
     "java.base/java.lang=ALL-UNNAMED",
-
     "-jar",
     launcher_path,
-
     "-javaagent",
     lombok_path,
     "-Xbootclasspath/a",
     lombok_path,
-
     "-configuration",
     get_config_dir(),
     "-data",
@@ -98,7 +91,7 @@ local config = {
       maven = { downloadSources = true },
       signatureHelp = { enabled = true },
       contentProvider = { preferred = "fernflower" },
-      saveActions = { organizeImports = false },
+      saveActions = { organizeImports = true },
       sources = {
         organizeImports = {
           starThreshold = 9999,
@@ -229,7 +222,6 @@ local config = {
       end,
       "Extract Constant",
     }
-
     map {
       "v",
       "crm",
@@ -278,4 +270,4 @@ vim.api.nvim_create_autocmd({ "BufWritePost" }, {
   end,
 })
 
-require("lib.gradle").setup { root_dir = root_dir }
+require("lib.gradle").setup { root_dir = root_dir }
diff --git a/after/ftplugin/lua.lua b/after/ftplugin/lua.lua
@@ -0,0 +1,10 @@
+-------------------------------------
+-- File         : lua.lua
+-- Description  : Lua filetype extra config
+-- Author       : Kevin
+-- Last Modified: 19/01/2025 - 10:15
+-------------------------------------
+
+vim.keymap.set("n", "<leader>r", "<cmd>lua<CR>", { desc = "Execute current line" })
+vim.keymap.set("n", "<leader>R", "<cmd>% lua<CR>", { desc = "Execute the current file" })
+vim.keymap.set("x", "<leader>r", ":'<,'>lua<CR>", { desc = "Execute current selection" })
diff --git a/lazy-lock.json b/lazy-lock.json
@@ -1,39 +1,39 @@
 {
-  "SchemaStore.nvim": { "branch": "main", "commit": "b62efcb71077bfeb407dcd05fb0584e422131150" },
+  "SchemaStore.nvim": { "branch": "main", "commit": "4244700eff0a9258b88f48b2b0d0339dea3338af" },
   "alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" },
-  "blink.cmp": { "branch": "main", "commit": "1cc3b1a908fbcfd15451c4772759549724f38524" },
+  "blink.cmp": { "branch": "main", "commit": "b6f11a0aa33e601c469a126e3ed6e35208fe3ea3" },
   "color-picker.nvim": { "branch": "master", "commit": "06cb5f853535dea529a523e9a0e8884cdf9eba4d" },
-  "conform.nvim": { "branch": "master", "commit": "6dc21d4ce050c2e592d9635b7983d67baf216e3d" },
+  "conform.nvim": { "branch": "master", "commit": "363243c03102a531a8203311d4f2ae704c620d9b" },
   "data-viewer.nvim": { "branch": "main", "commit": "40ddf37bb7ab6c04ff9e820812d1539afe691668" },
-  "gitsigns.nvim": { "branch": "main", "commit": "817bd848fffe82e697b4da656e3f2834cd0665c5" },
-  "go.nvim": { "branch": "master", "commit": "6e5a74b866aa4a112ed85a1169befff2ef82c027" },
+  "gitsigns.nvim": { "branch": "main", "commit": "9b36d497495436c135659902054ee637e0ba6021" },
+  "go.nvim": { "branch": "master", "commit": "79857f92433d18857167cdc18c417701778185bf" },
   "hererocks": { "branch": "master", "commit": "c9c5444dea1e07e005484014a8231aa667be30b6" },
-  "image.nvim": { "branch": "master", "commit": "f1163cc2f6fff5b0de7c23c7502eee0df23a3e0e" },
+  "image.nvim": { "branch": "master", "commit": "6ffafab2e98b5bda46bf227055aa84b90add8cdc" },
   "jupytext.nvim": { "branch": "main", "commit": "c8baf3ad344c59b3abd461ecc17fc16ec44d0f7b" },
-  "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" },
-  "lazydev.nvim": { "branch": "main", "commit": "8620f82ee3f59ff2187647167b6b47387a13a018" },
-  "markdown.nvim": { "branch": "main", "commit": "ad055861d17afe058bd835e82292e14a64b51b1d" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "e942edf5c85b6a2ab74059ea566cac5b3e1514a4" },
+  "lazy.nvim": { "branch": "main", "commit": "7527af40ddd4a93a02911be570b32609b9d4ea53" },
+  "lazydev.nvim": { "branch": "main", "commit": "a1b78b2ac6f978c72e76ea90ae92a94edf380cfc" },
+  "markdown.nvim": { "branch": "main", "commit": "b9c98ff7d47dfe2a972f1b08340850c92e6ca9bc" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "f75e877f5266e87523eb5a18fcde2081820d087b" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
-  "mini.icons": { "branch": "main", "commit": "910db5df9724d65371182948f921fce23c2c881e" },
-  "mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" },
-  "mini.surround": { "branch": "main", "commit": "aa5e245829dd12d8ff0c96ef11da28681d6049aa" },
-  "molten-nvim": { "branch": "main", "commit": "c621baf53459a6c45dfd98dcc11cbba7a7ae9470" },
+  "mini.icons": { "branch": "main", "commit": "ec61af6e606fc89ee3b1d8f2f20166a3ca917a36" },
+  "mini.pairs": { "branch": "main", "commit": "1a3e73649c0eaef2f6c48ce1e761c6f0a7c11918" },
+  "mini.surround": { "branch": "main", "commit": "ceddea5fe862f13b279d9bbe81c3327a0e66d56b" },
+  "molten-nvim": { "branch": "main", "commit": "a286aa914d9a154bc359131aab788b5a077a5a99" },
   "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
-  "nvim-dap": { "branch": "master", "commit": "99807078c5089ed30e0547aa4b52c5867933f426" },
-  "nvim-dap-ui": { "branch": "master", "commit": "727c032a8f63899baccb42a1c26f27687e62fc5e" },
-  "nvim-dbee": { "branch": "master", "commit": "21d2cc0844a16262bb6ea93ab3d0a0f20bd87853" },
-  "nvim-jdtls": { "branch": "master", "commit": "5b079475890a2a9ff45c850b428357cc89c95278" },
-  "nvim-lint": { "branch": "master", "commit": "dfa45de973c3ce7bd1b9a6d346f896a68ad07e44" },
-  "nvim-lspconfig": { "branch": "master", "commit": "339ccc81e08793c3af9b83882a6ebd90c9cc0d3b" },
-  "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
-  "nvim-notify": { "branch": "master", "commit": "a3020c2cf4dfc4c4f390c4a21e84e35e46cf5d17" },
-  "nvim-treesitter": { "branch": "master", "commit": "5da195ac3dfafd08d8b10756d975f0e01e1d563a" },
+  "nvim-dap": { "branch": "master", "commit": "b4f27d451c187de912fa8d3229025a952917eb9e" },
+  "nvim-dap-ui": { "branch": "master", "commit": "bc81f8d3440aede116f821114547a476b082b319" },
+  "nvim-dbee": { "branch": "master", "commit": "495f6f718ccfb98eba51c7998e30f3f3ea6e95e1" },
+  "nvim-jdtls": { "branch": "master", "commit": "3efcd0700a293efea9dada58f79c32a64850eb24" },
+  "nvim-lint": { "branch": "master", "commit": "789b7ada1b4f00e08d026dffde410dcfa6a0ba87" },
+  "nvim-lspconfig": { "branch": "master", "commit": "ead2fbc4893fdd062e1dd0842679a48bfb7bac5c" },
+  "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
+  "nvim-notify": { "branch": "master", "commit": "22f29093eae7785773ee9d543f8750348b1a195c" },
+  "nvim-treesitter": { "branch": "master", "commit": "bcd0b26607c1a4336c392285a9f13e31f514ccf2" },
   "nvim-treesitter-refactor": { "branch": "master", "commit": "d8b74fa87afc6a1e97b18da23e762efb032dc270" },
-  "nvim-ufo": { "branch": "main", "commit": "32cb247b893a384f1888b9cd737264159ecf183c" },
+  "nvim-ufo": { "branch": "main", "commit": "81f5ffa6e8ba27c48403cf681d4b383d924e03e4" },
   "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" },
-  "oil.nvim": { "branch": "master", "commit": "09fa1d22f5edf0730824d2b222d726c8c81bbdc9" },
+  "oil.nvim": { "branch": "master", "commit": "add50252b5e9147c0a09d36480d418c7e2737472" },
   "otter.nvim": { "branch": "main", "commit": "3ff6c154d55528fbde475b2a722f91389421e873" },
   "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" },
   "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
@@ -42,6 +42,6 @@
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
   "telescope.nvim": { "branch": "master", "commit": "415af52339215926d705cccc08145f3782c4d132" },
-  "vimtex": { "branch": "master", "commit": "c8412f444bfaf447981242d685c40e45b1c96b82" },
-  "which-key.nvim": { "branch": "main", "commit": "1f8d414f61e0b05958c342df9b6a4c89ce268766" }
+  "vimtex": { "branch": "master", "commit": "3a9f47ce6e42c4a3c9a92a254f1f611a8d374fc9" },
+  "which-key.nvim": { "branch": "main", "commit": "0e76a87ac51772569aec678dc74baa8e2a86100c" }
 }
diff --git a/lua/lib/gradle.lua b/lua/lib/gradle.lua
@@ -34,14 +34,15 @@ local function get_gradle_tasks(gradlew, root_dir)
 end
 
 local function run_gradle_task(gradlew, task)
-  local msg = string.format(" running: < gradlew %s >", task)
+  -- local msg = string.format(" < gradlew %s >", task)
   -- vim.notify(msg, 2, { title = "Gradle" })
-  print("Gradle⟩ " .. msg)
+  print("Gradle⟩ " .. task)
   vim.system({ gradlew, task }, { text = true }, function(obj)
     local out = (obj.code ~= 0) and obj.stderr or obj.stdout
 
     vim.schedule(function()
-      local text = string.format("  OUTPUT⟩ gradle %s\n\n%s", task, out)
+      local sep = "---------------------------------"
+      local text = string.format("   OUTPUT⟩ gradle %s\n%s\n%s", task, sep, out)
       local lines = vim.split(text, "\n")
 
       local buf = vim.api.nvim_create_buf(false, true)

diff --git a/lua/plugins/editor/completion.lua b/lua/plugins/editor/completion.lua
@@ -26,6 +26,8 @@ return {
         ["<C-k>"] = { "select_prev", "fallback" },
         ["<C-j>"] = { "select_next", "fallback" },
         ["<C-Space>"] = { "show", "hide" },
+        ["<Tab>"] = { "show", "select_next", "fallback" },
+        ["<S-Tab>"] = { "show", "select_prev", "fallback" },
         ["<C-e>"] = { "cancel" },
       },
     },
@@ -120,4 +122,4 @@ return {
       ghost_text = { enabled = true },
     },
   },
-}
+}
diff --git a/lua/plugins/lsp/init.lua b/lua/plugins/lsp/init.lua
@@ -116,7 +116,7 @@ local function set_buf_keymaps(client, bufnr)
   nmap { "<leader>ll", vim.lsp.codelens.run, "CodeLens" }
 
   -- Enable completion on <c-x><c-o>
-  -- vim.bo[bufnr].omnifunc = "v:lua.vim.lsp.omnifunc"
+  vim.bo[bufnr].omnifunc = "v:lua.vim.lsp.omnifunc"
 end
 
 --- Set buffer capabilities if supported by the passed client and buffer id
@@ -609,10 +609,12 @@ return {
         typescriptreact = { "prettier" },
         html = { "prettier" },
         json = { "prettier" },
-        yaml = { { "yamlfmt", "prettier" } },
+        yaml = { "yamlfmt", "prettier" },
         -- java = { "google-java-format" },
       }
 
+      o.stop_after_first = true
+
       o.format_on_save = function(bufnr)
         if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
           return

diff --git a/plugin/prefs.lua b/plugin/prefs.lua
@@ -21,8 +21,8 @@ local settings = {
   termguicolors = true,
   laststatus = 3,
   guifont = "Fira Code:h12.5,Symbols Nerd Font Mono:13",
-  relativenumber = true,
   number = true,
+  relativenumber = true,
   showmode = false,
   scrolloff = 4,
   sidescrolloff = 10,
@@ -103,4 +103,4 @@ local settings = {
 
 for k, o in pairs(settings) do
   vim.opt[k] = o
-end
+end
diff --git a/plugin/usercommands.lua b/plugin/usercommands.lua
@@ -57,12 +57,12 @@ user_command("WipeReg", function()
 end, { desc = "Wipe all Registers" })
 
 ---Sessions
-vim.api.nvim_create_user_command("Session", function(arg)
+user_command("Session", function(arg)
   require("lib.session").select(arg.args)
 end, {
   nargs = "?",
   desc = "Session Manager",
-  -- complete = "custom,v:lua.require'lib.session'.usercmd_session_completion",
+  complete = "custom,v:lua.require'lib.session'.usercmd_session_completion",
 })
 
 ---Config File
@@ -172,4 +172,4 @@ usercmd_toggle("ToggleAutoTrimTrailSpaces", "auto_remove_trail_spaces", {
       vim.api.nvim_del_autocmd(autocmd[1].id)
     end
   end,
-})
+})