fix: aerial tree collapse state shouldn't affect get_location (#163)

stevearc · Oct 16, 2022 · c248731 · c248731
1 parent 4530412
commit c248731
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/lua/aerial/init.lua b/lua/aerial/init.lua
@@ -140,7 +140,8 @@ M.get_location = function(exact)
   end
   local winid = vim.api.nvim_get_current_win()
   local bufdata = data[0]
-  local pos = bufdata.positions[winid]
+  local cur = vim.api.nvim_win_get_cursor(winid)
+  local pos = window.get_symbol_position(bufdata, cur[1], cur[2], true)
   if not pos then
     return {}
   end

diff --git a/lua/aerial/window.lua b/lua/aerial/window.lua
@@ -362,8 +362,9 @@ end
 ---@param bufdata aerial.BufData
 ---@param lnum integer
 ---@param col integer
+---@param include_hidden nil|boolean
 ---@return aerial.CursorPosition
-M.get_symbol_position = function(bufdata, lnum, col)
+M.get_symbol_position = function(bufdata, lnum, col, include_hidden)
   local selected = 0
   local relative = "above"
   local prev = nil
@@ -387,7 +388,7 @@ M.get_symbol_position = function(bufdata, lnum, col)
     end
     prev = item
     selected = selected + 1
-  end)
+  end, { incl_hidden = include_hidden })
   -- Check if we're on the last symbol
   if symbol == nil then
     symbol = prev