mirrors/snacks.nvim
1
0
Fork 0
mirror of https://github.com/folke/snacks.nvim synced 2025-08-06 11:48:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix(picker.lsp): fix indent guides for sorted document symbols

Browse source
This commit is contained in:
Folke Lemaitre 2025-02-07 09:24:55 +01:00
parent cc22177dcf
commit 17360e4009
No known key found for this signature in database
GPG key ID: 41F8B1FBACAE2040
1 changed files with 18 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

40
lua/snacks/picker/source/lsp.lua
View file

@ -248,29 +248,8 @@ end
function M.results_to_items(client, results, opts) function M.results_to_items(client, results, opts)
opts = opts or {} opts = opts or {}
local items = {} ---@type snacks.picker.finder.Item[] local items = {} ---@type snacks.picker.finder.Item[]
local locs = {} ---@type lsp.Loc[]
---@param result lsp.ResultItem
local function process(result)
local uri = result.location and result.location.uri or result.uri or opts.default_uri
local loc = result.location or { range = result.selectionRange or result.range, uri = uri }
loc.uri = loc.uri or uri
if not loc.uri then
assert(loc.uri, "missing uri in result:\n" .. vim.inspect(result))
end
if not opts.filter or opts.filter(result) then
locs[#locs + 1] = loc
end
for _, child in ipairs(result.children or {}) do
process(child)
end
end
for _, result in ipairs(results) do
process(result)
end
local last = {} ---@type table<snacks.picker.finder.Item, snacks.picker.finder.Item> local last = {} ---@type table<snacks.picker.finder.Item, snacks.picker.finder.Item>
---@param result lsp.ResultItem ---@param result lsp.ResultItem
---@param parent snacks.picker.finder.Item ---@param parent snacks.picker.finder.Item
local function add(result, parent) local function add(result, parent)
@ -375,12 +354,29 @@ function M.symbols(opts, ctx)
return want(M.symbol_kind(item.kind)) return want(M.symbol_kind(item.kind))
end, end,
}) })
-- Fix sorting
table.sort(items, function(a, b) table.sort(items, function(a, b)
if a.pos[1] == b.pos[1] then if a.pos[1] == b.pos[1] then
return a.pos[2] < b.pos[2] return a.pos[2] < b.pos[2]
end end
return a.pos[1] < b.pos[1] return a.pos[1] < b.pos[1]
end) end)
-- fix last
local last = {} ---@type table<snacks.picker.finder.Item, snacks.picker.finder.Item>
for _, item in ipairs(items) do
item.last = nil
local parent = item.parent
if parent then
if last[parent] then
last[parent].last = nil
end
last[parent] = item
item.last = true
end
end
for _, item in ipairs(items) do for _, item in ipairs(items) do
item.tree = opts.tree item.tree = opts.tree
item.buf = bufmap[item.file] item.buf = bufmap[item.file]