fix merge

Author: pynappo

README.md

@@ -47,16 +47,14 @@ should you!
 
 - Neo-tree won't let other buffers take over its window.
 - Neo-tree won't leave its window scrolled to the last line when there is plenty
-of room to display the whole tree.
+  of room to display the whole tree.
 - Neo-tree does not need to be manually refreshed (set `use_libuv_file_watcher =
   true`)
 - Neo-tree can intelligently follow the current file (set
   `follow_current_file.enabled = true`)
-- Neo-tree won't leave its window scrolled to the last line when there is
-  plenty of room to display the whole tree.
 - Neo-tree can sync its clipboard across multiple instances, either globally
   (within the same Neovim instance) or universally (across multiple Neovim
-  instances)
+  instances). Set `clipboard.sync = "global" | "universal"`
 - Neo-tree is thoughtful about maintaining or setting focus on the right node
 - Neo-tree windows in different tabs are completely separate
 - `respect_gitignore` actually works!

lua/neo-tree/sources/manager.lua

@@ -51,13 +51,15 @@ end
 
 ---@alias neotree.Internal.SortFieldProvider fun(node: NuiTree.Node):any
 
+---@alias neotree.Config.SortFunction fun(a: NuiTree.Node, b: NuiTree.Node):boolean?
+
 ---@class neotree.State : neotree.Config.Source
 ---@field name string
 ---@field tabid integer
 ---@field id integer
 ---@field bufnr integer?
 ---@field dirty boolean
----@field position table
+---@field position neotree.State.Position
 ---@field git_base string
 ---@field sort table
 ---@field clipboard neotree.clipboard.Contents
@@ -103,7 +105,7 @@ end
 ---@field search_pattern string?
 ---@field use_fzy boolean?
 ---@field fzy_sort_result_scores table<string, integer?>?
----@field fuzzy_finder_mode string?
+---@field fuzzy_finder_mode "directory"|boolean?
 ---@field open_folders_before_search table?
 ---sort
 ---@field sort_function_override neotree.Config.SortFunction?