fzy

JavaHello · JavaHello · commit cf6bb7216d81 · 2024-12-28T20:15:27.000+08:00
diff --git a/ftplugin/json.lua b/ftplugin/json.lua
@@ -1 +1,3 @@
-vim.bo.formatprg = "jq ."
+vim.bo.shiftwidth = 2
+vim.bo.tabstop = 2
+vim.bo.softtabstop = 2
diff --git a/lua/kide/init.lua b/lua/kide/init.lua
@@ -31,9 +31,8 @@ function M.file_or_lsp_status()
 end
 function M.format_uri(uri)
   if vim.startswith(uri, "jdt://") then
-    local package = uri:match("contents/[%a%d._-]+/([%a%d._-]+)") or ""
-    local class = uri:match("contents/[%a%d._-]+/[%a%d._-]+/([%a%d$]+).class") or ""
-    return string.format("%s::%s", package, class)
+    local jar, pkg, class = uri:match("^jdt://contents/([^/]+)/([^/]+)/(.+)?")
+    return string.format("%s::%s (%s)", pkg, class, jar)
   else
     local fname = vim.fn.fnamemodify(vim.uri_to_fname(uri), ":.")
     fname = fname:gsub("src/main/java/", "s/m/j/")
diff --git a/lua/mappings.lua b/lua/mappings.lua
@@ -219,13 +219,22 @@ if vim.fn.executable("find") == 1 then
 end
 
 if vim.fn.executable("fzy") == 1 then
+  command("Rg", function(opt)
+    local fzy = require("kide.fzy")
+    fzy.execute("rg --no-heading --trim -nH --smart-case " .. opt.args, fzy.sinks.edit_live_grep, "Grep  ")
+  end, {
+    desc = "Grep",
+    nargs = 1,
+  })
   map("n", "<leader>fb", function()
     local fzy = require("kide.fzy")
     local bufs = vim.api.nvim_list_bufs()
     local cats = {}
     for _, v in ipairs(bufs) do
-      local buf_name = vim.api.nvim_buf_get_name(v)
-      table.insert(cats, tostring(v) .. ": " .. buf_name)
+      if vim.bo[v].buflisted then
+        local buf_name = vim.api.nvim_buf_get_name(v)
+        table.insert(cats, tostring(v) .. ": " .. buf_name)
+      end
     end
     local param = vim.fn.shellescape(table.concat(cats, "\n"))
     fzy.execute("echo -e " .. param, function(choice)
