nvim: fixes

Author: debugloop

home/nvim/ftplugin/go.lua

@@ -32,37 +32,24 @@ vim.api.nvim_create_autocmd("LspAttach", {
 
 -- surrounding test name
 function SurroundingTestName()
-  local inTestfile = false
+  -- return immediately if we're not in a test file
   if vim.fn.expand("%:t"):sub(-#"_test.go", -1) ~= "_test.go" then
-    return inTestfile, ""
-  else
-    inTestfile = true
+    return false, ""
   end
   -- see if we can find a specific test to run
-  local cursor = vim.api.nvim_win_get_cursor(0)
-  local lsp_response, lsp_err = vim.lsp.buf_request_sync(
-    0,
-    "textDocument/documentSymbol",
-    { textDocument = vim.lsp.util.make_text_document_params() },
-    1000
-  )
-  if lsp_err ~= nil or lsp_response == nil then
-    return inTestfile, ""
-  end
-
-  for _, symbol in pairs(lsp_response[1].result) do
-    if
-      symbol["detail"] ~= nil
-      and symbol.detail:sub(1, 4) == "func"
-      and symbol.name:sub(1, 4) == "Test"
-      and cursor[1] > symbol.range.start.line
-      and cursor[1] < symbol.range["end"].line
-    then
-      return inTestfile, symbol.name
+  local node = vim.treesitter.get_node()
+  while node do
+    if node:type() == "function_declaration" or node:type() == "method_declaration" then
+      local name = node:named_child(0)
+      if name then
+        return true, vim.treesitter.get_node_text(name, 0)
+      end
+      break
     end
+    node = node:parent()
   end
 
-  return inTestfile, ""
+  return true, ""
 end
 
 vim.keymap.set("n", "gY", function()

home/nvim/lua/lsp.lua

@@ -1,16 +1,12 @@
 local function root_dir(patterns)
-  patterns = patterns or {}
+  patterns = patterns or { ".git/", "README.md", "flake.nix" }
   local matches = vim.fs.find(patterns, {
     upward = true,
   })
   if matches then
     return vim.fs.dirname(matches[1])
   end
-
-  local default_patterns = { ".git/", "README.md", "flake.nix" }
-  return vim.fs.dirname(vim.fs.find(default_patterns, {
-    upward = true,
-  })[1])
+  return "~"
 end
 
 -- remove defaults
@@ -22,8 +18,17 @@ vim.keymap.del("n", "grr")
 
 -- add my own
 vim.keymap.set("n", "<leader>r", vim.lsp.buf.rename, { desc = "lsp: rename symbol" })
-vim.keymap.set("n", "<leader>?", vim.lsp.buf.code_action, { desc = "lsp: run code action" })
-vim.keymap.set("n", "go", vim.lsp.buf.document_symbol, { desc = "lsp: show symbols" })
+vim.keymap.set({ "n", "x" }, "<leader>?", function()
+  local line = vim.api.nvim_win_get_cursor(0)[1]
+  for _, lens in pairs(vim.lsp.codelens.get(0)) do
+    if lens.range.start.line == (line - 1) and lens.command and lens.command.command ~= "" then
+      vim.lsp.codelens.run()
+      return
+    end
+  end
+  vim.lsp.buf.code_action()
+end, { desc = "lsp: run codelens or code action" })
+vim.keymap.set({ "n", "x" }, "go", vim.lsp.buf.document_symbol, { desc = "lsp: show symbols" })
 vim.keymap.set("n", "gO", vim.lsp.buf.workspace_symbol, { desc = "lsp: show workspacesymbols" })
 vim.keymap.set("n", "gd", vim.lsp.buf.definition, { desc = "lsp: show definition" })
 vim.keymap.set("n", "gD", vim.lsp.buf.type_definition, { desc = "lsp: show type definition" })
@@ -39,6 +44,14 @@ vim.lsp.config("gopls", {
   cmd = { "gopls" },
   filetypes = { "go", "gomod", "gowork", "gotmpl" },
   on_attach = function(_, _)
+    vim.o.foldexpr = "v:lua.vim.lsp.foldexpr()"
+
+    -- display code lenses
+    vim.api.nvim_create_autocmd({ "BufEnter", "CursorHold", "InsertLeave" }, {
+      callback = function(args)
+        vim.lsp.codelens.refresh({ bufnr = args.buf })
+      end,
+    })
     -- modify some semantic tokens
     vim.api.nvim_create_autocmd("LspTokenUpdate", {
       callback = function(args)
@@ -66,6 +79,9 @@ vim.lsp.config("gopls", {
       },
       semanticTokens = true,
       staticcheck = true,
+      analyses = {
+        ST1000 = false,
+      },
       vulncheck = "Imports",
       hints = {
         assignVariableTypes = true,
@@ -76,8 +92,6 @@ vim.lsp.config("gopls", {
         parameterNames = true,
         rangeVariableTypes = true,
       },
-      completeUnimported = true,
-      deepCompletion = true,
     },
   },
 })
@@ -137,4 +151,24 @@ vim.lsp.config("typos-lsp", {
   },
 })
 
-vim.lsp.enable({ "gopls", "typos-lsp", "nixd", "templ", "javascript", "lua_ls" })
+vim.lsp.config("harper", {
+  cmd = { "harper-ls", "--stdio" },
+  filetypes = { "markdown" },
+  root_dir = root_dir(),
+  settings = {
+    ["harper-ls"] = {
+      linters = {
+        SpellCheck = false,
+        ToDoHyphen = false,
+      },
+    },
+  },
+})
+
+vim.lsp.config("fish", {
+  cmd = { "fish-lsp", "start" },
+  filetypes = { "fish" },
+  root_dir = root_dir(),
+})
+
+vim.lsp.enable({ "gopls", "typos-lsp", "nixd", "templ", "javascript", "lua_ls", "harper", "fish" })

home/nvim/lua/plugins.lua

@@ -34,6 +34,13 @@ return inject_all({
       appearance = {
         use_nvim_cmp_as_default = true,
       },
+      cmdline = {
+        enabled = true,
+        keymap = {
+          preset = "cmdline",
+          ["<c-space>"] = { "select_and_accept" },
+        },
+      },
       completion = {
         accept = {
           auto_brackets = {
@@ -474,6 +481,7 @@ return inject_all({
         },
         N = require("mini.extra").gen_ai_spec.number(),
         F = function(ai, _, _)
+          -- TODO: write using lua ts api
           if ai == "i" then
             return require("mini.ai").gen_spec.treesitter({ i = "@function.name", a = "@function.name" }, {})(
               "i",
@@ -693,8 +701,7 @@ return inject_all({
   },
 
   {
-    "echasnovski/mini-git",
-    name = "mini.git",
+    "echasnovski/mini.git",
     opts = {},
   },
 
@@ -946,8 +953,7 @@ return inject_all({
         "echasnovski/mini.icons",
       },
       {
-        "echasnovski/mini-git",
-        name = "mini.git",
+        "echasnovski/mini.git",
       },
       {
         "echasnovski/mini.diff",
@@ -1083,21 +1089,41 @@ return inject_all({
       { "MunifTanjim/nui.nvim" },
     },
     opts = {
+      cmdline = {
+        enabled = true,
+      },
+      messages = {
+        enabled = true,
+        view_search = false,
+      },
+      popupmenu = {
+        enabled = false,
+        backend = "cmp",
+      },
+      notify = {
+        enabled = true,
+      },
       lsp = {
+        progress = {
+          enabled = true,
+        },
+        override = {
+          ["vim.lsp.util.convert_input_to_markdown_lines"] = true,
+          ["vim.lsp.util.stylize_markdown"] = true,
+        },
         hover = {
           silent = true,
           opts = {
             border = "solid",
             max_width = 100,
           },
         },
-        override = {
-          ["vim.lsp.util.convert_input_to_markdown_lines"] = true,
-          ["vim.lsp.util.stylize_markdown"] = true,
-        },
         signature = {
           enabled = false,
         },
+        message = {
+          enabled = true,
+        },
       },
       presets = {
         bottom_search = true,
@@ -1142,7 +1168,7 @@ return inject_all({
 
   {
     "kevinhwang91/nvim-bqf",
-    ft = "qf",
+    event = "VeryLazy",
     dependencies = {
       {
         "junegunn/fzf",
@@ -1423,14 +1449,14 @@ return inject_all({
             { desc = "open dap-view" },
           },
           { -- step over/next
-            "s",
+            "n",
             function()
               dap.step_over()
             end,
             { desc = "step forward" },
           },
           { -- step back
-            "S",
+            "N",
             function()
               dap.step_back()
             end,
@@ -1704,7 +1730,7 @@ return inject_all({
         desc = "find more files smartly",
       },
       {
-        "<leader>,",
+        "<leader>;",
         function()
           Snacks.picker.buffers()
         end,
@@ -1916,8 +1942,7 @@ return inject_all({
     "folke/snacks.nvim",
     dependencies = {
       {
-        "echasnovski/mini-git",
-        name = "mini.git",
+        "echasnovski/mini.git",
       },
     },
     keys = {
@@ -2196,7 +2221,6 @@ return inject_all({
       bigfile = { enabled = true },
       input = { enabled = true },
       image = { enabled = true },
-      notifier = { enabled = true },
       quickfile = { enabled = true },
       scroll = {
         enabled = true,
@@ -2206,9 +2230,6 @@ return inject_all({
       },
       statuscolumn = { enabled = true },
       styles = {
-        notification = {
-          wo = { wrap = true },
-        },
         zen = {
           backdrop = {
             transparent = false,