qvacua/vimr
1
1
Fork 0
mirror of https://github.com/qvacua/vimr.git synced 2024-11-24 11:37:32 +03:00
Code Issues Projects Releases Wiki Activity

Simplify handle children in the file browser update

Browse Source
This commit is contained in:
Tae Won Ha 2017-05-19 00:25:47 +02:00
parent 4d5a478cbb
commit c874701c7e
No known key found for this signature in database
GPG Key ID: E40743465B5B8B44
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
VimR/FileOutlineView.swift
View File

@ -174,18 +174,6 @@ class FileOutlineView: NSOutlineView,
self.insertItems(at: IndexSet(indicesToInsert), inParent: parent)
}
fileprivate func handleChildren(for fileBrowserItem: FileBrowserItem, new newChildren: [FileBrowserItem]) {
let curChildren = fileBrowserItem.children
let curPreparedChildren = self.prepare(curChildren)
let newPreparedChildren = self.prepare(newChildren)
let keptChildren = curPreparedChildren.filter { newPreparedChildren.contains($0) }
let childrenToRecurse = keptChildren.filter { self.isItemExpanded($0) }
childrenToRecurse.forEach(self.update)
}
fileprivate func sortedChildren(of url: URL) -> [FileBrowserItem] {
return FileUtils.directDescendants(of: url).map(FileBrowserItem.init).sorted()
}
@ -198,7 +186,7 @@ class FileOutlineView: NSOutlineView,
self.handleRemovals(for: fileBrowserItem, new: newChildren)
self.handleAdditions(for: fileBrowserItem, new: newChildren)
self.handleChildren(for: fileBrowserItem, new: newChildren)
fileBrowserItem.children.filter { self.isItemExpanded($0) }.forEach(self.update)
}
fileprivate func fileBrowserItem(with url: URL) -> FileBrowserItem? {
@ -234,7 +222,7 @@ extension FileOutlineView {
func outlineView(_: NSOutlineView, numberOfChildrenOfItem item: Any?) -> Int {
if item == nil {
if self.root.isChildrenScanned == false {
self.root.children = sortedChildren(of: self.cwd)
self.root.children = self.sortedChildren(of: self.cwd)
self.root.isChildrenScanned = true
}