1
1
mirror of https://github.com/qvacua/vimr.git synced 2024-11-24 03:25:03 +03:00

GH-799 Refactor slightly

This commit is contained in:
Tae Won Ha 2020-06-19 17:08:05 +02:00
parent 9c4545fa7c
commit 44e0a97868
No known key found for this signature in database
GPG Key ID: E40743465B5B8B44

View File

@ -155,7 +155,7 @@ class FileOutlineView: NSOutlineView,
private func handleFileSystemChanges(_ changedUrl: URL) {
DispatchQueue.main.async {
guard let changeTreeNode = self.changeRootTreeNode(for: changedUrl) else { return }
guard let changeTreeNode = self.changedTreeNode(for: changedUrl) else { return }
let newChildUrls = Set(self.childUrls(for: changedUrl))
self.handleRemoval(changeTreeNode: changeTreeNode, newChildUrls: newChildUrls)
@ -218,7 +218,7 @@ class FileOutlineView: NSOutlineView,
self.bind(.selectionIndexPaths, to: self.treeController, withKeyPath: "selectionIndexPaths")
}
private func changeRootTreeNode(`for` url: URL) -> NSTreeNode? {
private func changedTreeNode(`for` url: URL) -> NSTreeNode? {
if url == self.cwd { return self.treeController.arrangedObjects }
let cwdCompsCount = self.cwd.pathComponents.count
@ -226,15 +226,15 @@ class FileOutlineView: NSOutlineView,
let comps = url.pathComponents.suffix(cwdCompsCount)
let rootTreeNode = self.treeController.arrangedObjects
let changeTreeNode = comps.reduce(rootTreeNode) { prev, comp in
return prev.children?.first { child in return child.node?.displayName == comp } ?? prev
let changedTreeNode = comps.reduce(rootTreeNode) { prev, comp in
prev.children?.first { child in return child.node?.displayName == comp } ?? prev
}
guard let changeNode = changeTreeNode.node else { return nil }
guard let changeNode = changedTreeNode.node else { return nil }
guard changeNode.url == url && changeNode.children != nil else { return nil }
return changeTreeNode
return changedTreeNode
}
private func handleAddition(changeTreeNode: NSTreeNode, newChildUrls: Set<URL>) {