feat: better interact with pickers

Author: neo451

lua/obsidian/commands/__toc.lua

@@ -0,0 +1,59 @@
+-- TODO: all pickers should do on_list callbacks
+
+local telescope_on_list = function(data)
+  local pickers = require "telescope.pickers"
+  local finders = require "telescope.finders"
+  pickers
+    .new({}, {
+      prompt_title = "Table of Contents",
+      finder = finders.new_table {
+        results = data.items,
+        entry_maker = function(value)
+          return {
+            value = value,
+            display = value.text,
+            path = value.filename,
+            ordinal = value.text,
+          }
+        end,
+      },
+    })
+    :find()
+end
+
+local function mini_pick_on_list(data)
+  local ok, pick = pcall(require, "mini.pick")
+  if not ok then
+    vim.notify("no mini.pick found", 3)
+    return
+  end
+
+  local items = data.items
+  for _, item in ipairs(data.items) do
+    item.path = item.filename
+  end
+
+  pick.start {
+    source = { items = items },
+    name = "Table of Contents",
+    show = pick.default_show,
+    choose = pick.default_choose,
+  }
+end
+
+---@param client obsidian.Client
+---@param _ CommandArgs
+return function(client, _)
+  local picker_name = tostring(client:picker())
+  if picker_name == "TelescopePicker()" then
+    vim.lsp.buf.document_symbol { on_list = telescope_on_list }
+  elseif picker_name == "SnacksPicker()" then
+    require("snacks.picker").lsp_symbols()
+  elseif picker_name == "FzfPicker()" then
+    require("fzf-lua").lsp_document_symbols()
+  elseif picker_name == "MiniPicker()" then
+    vim.lsp.buf.document_symbol { on_list = mini_pick_on_list }
+  else
+    vim.lsp.buf.document_symbol { loclist = false }
+  end
+end

lua/obsidian/commands/backlinks.lua

@@ -1,56 +1,25 @@
-local util = require "obsidian.util"
 local log = require "obsidian.log"
-local RefTypes = require("obsidian.search").RefTypes
 
----@param client obsidian.Client
----@param picker obsidian.Picker
----@param note obsidian.Note
----@param opts { anchor: string|?, block: string|? }|?
-local function collect_backlinks(client, picker, note, opts)
-  opts = opts or {}
-
-  client:find_backlinks_async(note, function(backlinks)
-    if vim.tbl_isempty(backlinks) then
-      if opts.anchor then
-        log.info("No backlinks found for anchor '%s' in note '%s'", opts.anchor, note.id)
-      elseif opts.block then
-        log.info("No backlinks found for block '%s' in note '%s'", opts.block, note.id)
-      else
-        log.info("No backlinks found for note '%s'", note.id)
-      end
-      return
-    end
-
-    local entries = {}
-    for _, matches in ipairs(backlinks) do
-      for _, match in ipairs(matches.matches) do
-        entries[#entries + 1] = {
-          value = { path = matches.path, line = match.line },
-          filename = tostring(matches.path),
-          lnum = match.line,
-        }
-      end
-    end
-
-    ---@type string
-    local prompt_title
-    if opts.anchor then
-      prompt_title = string.format("Backlinks to '%s%s'", note.id, opts.anchor)
-    elseif opts.block then
-      prompt_title = string.format("Backlinks to '%s#%s'", note.id, util.standardize_block(opts.block))
-    else
-      prompt_title = string.format("Backlinks to '%s'", note.id)
-    end
-
-    vim.schedule(function()
-      picker:pick(entries, {
-        prompt_title = prompt_title,
-        callback = function(value)
-          util.open_buffer(value.path, { line = value.line })
+local telescope_on_list = function(data)
+  local pickers = require "telescope.pickers"
+  local finders = require "telescope.finders"
+  pickers
+    .new({}, {
+      prompt_title = "References",
+      finder = finders.new_table {
+        results = data.items,
+        entry_maker = function(value)
+          return {
+            value = value,
+            display = value.text,
+            path = value.filename,
+            ordinal = value.text,
+            lnum = value.lnum,
+          }
         end,
-      })
-    end)
-  end, { search = { sort = true }, anchor = opts.anchor, block = opts.block })
+      },
+    })
+    :find()
 end
 
 ---@param client obsidian.Client
@@ -60,77 +29,19 @@ return function(client)
     log.err "No picker configured"
     return
   end
-
-  local location, _, ref_type = util.parse_cursor_link { include_block_ids = true }
-
-  if
-    location ~= nil
-    and ref_type ~= RefTypes.NakedUrl
-    and ref_type ~= RefTypes.FileUrl
-    and ref_type ~= RefTypes.BlockID
-  then
-    -- Remove block links from the end if there are any.
-    -- TODO: handle block links.
-    ---@type string|?
-    local block_link
-    location, block_link = util.strip_block_links(location)
-
-    -- Remove anchor links from the end if there are any.
-    ---@type string|?
-    local anchor_link
-    location, anchor_link = util.strip_anchor_links(location)
-
-    -- Assume 'location' is current buffer path if empty, like for TOCs.
-    if string.len(location) == 0 then
-      location = vim.api.nvim_buf_get_name(0)
-    end
-
-    local opts = { anchor = anchor_link, block = block_link }
-
-    client:resolve_note_async(location, function(...)
-      ---@type obsidian.Note[]
-      local notes = { ... }
-
-      if #notes == 0 then
-        log.err("No notes matching '%s'", location)
-        return
-      elseif #notes == 1 then
-        return collect_backlinks(client, picker, notes[1], opts)
-      else
-        return vim.schedule(function()
-          picker:pick_note(notes, {
-            prompt_title = "Select note",
-            callback = function(note)
-              collect_backlinks(client, picker, note, opts)
-            end,
-          })
-        end)
-      end
-    end)
+  local picker_name = tostring(picker)
+
+  if picker_name == "TelescopePicker()" then
+    vim.lsp.buf.references({
+      includeDeclaration = false,
+    }, { on_list = telescope_on_list })
+  elseif picker_name == "SnacksPicker()" then
+    require("snacks.picker").lsp_symbols()
+  elseif picker_name == "FzfPicker()" then
+    require("fzf-lua").lsp_document_symbols()
+  elseif picker_name == "MiniPicker()" then
+    -- vim.lsp.buf.document_symbol { on_list = mini_pick_on_list }
   else
-    ---@type { anchor: string|?, block: string|? }
-    local opts = {}
-    ---@type obsidian.note.LoadOpts
-    local load_opts = {}
-
-    if ref_type == RefTypes.BlockID then
-      opts.block = location
-    else
-      load_opts.collect_anchor_links = true
-    end
-
-    local note = client:current_note(0, load_opts)
-
-    -- Check if cursor is on a header, if so, use that anchor.
-    local header_match = util.parse_header(vim.api.nvim_get_current_line())
-    if header_match then
-      opts.anchor = header_match.anchor
-    end
-
-    if note == nil then
-      log.err "Current buffer does not appear to be a note inside the vault"
-    else
-      collect_backlinks(client, picker, note, opts)
-    end
+    vim.lsp.buf.document_symbol { loclist = false }
   end
 end

lua/obsidian/lsp/handlers/document_symbol.lua

@@ -5,5 +5,6 @@ local util = require "obsidian.lsp.util"
 ---@param handler function
 return function(client, params, handler)
   local bufnr = vim.uri_to_bufnr(params.textDocument.uri)
-  handler(nil, util.get_headings(client, bufnr))
+  local symbols = util.get_headings(bufnr)
+  handler(nil, symbols)
 end

lua/obsidian/lsp/handlers/references.lua

@@ -52,6 +52,7 @@ return function(obsidian_client, _, handler, _)
       --   return
       -- end
       --
+
       local entries = {}
       for _, matches in ipairs(backlinks) do
         for _, match in ipairs(matches.matches) do

lua/obsidian/lsp/util.lua

@@ -70,10 +70,9 @@ local link_query = [[
 ]]
 
 ---Extract headings from buffer
----@param client obsidian.Client
 ---@param bufnr integer
----@return table TODO:
-M.get_headings = function(client, bufnr)
+---@return lsp.DocumentSymbol[]
+M.get_headings = function(bufnr)
   local lang = ts.language.get_lang(vim.bo[bufnr].filetype)
   if not lang then
     return {}
@@ -85,7 +84,7 @@ M.get_headings = function(client, bufnr)
   for id, node, _, _ in query:iter_captures(root, bufnr) do
     local text = string.rep("#", id) .. " " .. ts.get_node_text(node, bufnr)
     local row, _ = node:start()
-    table.insert(headings, {
+    headings[#headings + 1] = {
       kind = 15,
       range = {
         start = { line = row, character = 1 },
@@ -96,7 +95,7 @@ M.get_headings = function(client, bufnr)
         ["end"] = { line = row, character = 1 },
       },
       name = text,
-    })
+    }
   end
   return headings
 end