qvacua/vimr
1
1
Fork 0
mirror of https://github.com/qvacua/vimr.git synced 2024-12-25 23:02:35 +03:00
Code Issues Projects Releases Wiki Activity

Fix crash when a temporary file gets deleted

Browse Source
This commit is contained in:
Tae Won Ha 2019-03-13 10:33:39 +01:00
parent 46db923e14
commit c6b0bbd340
No known key found for this signature in database
GPG Key ID: E40743465B5B8B44
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
VimR/VimR/FileOutlineView.swift
View File

@ -164,6 +164,10 @@ class FileOutlineView: NSOutlineView,
}
func unbindTreeController() {
// Forbid addition and removal now.
// See comment in FileOutlineView.handleRemoval.
self.treeController.isEditable = false
self.treeController.unbind(.contentArray)
self.unbind(.content)
self.unbind(.selectionIndexPaths)
@ -262,6 +266,9 @@ class FileOutlineView: NSOutlineView,
private func handleAddition(
changeTreeNode: NSTreeNode, newChildUrls: Set<URL>
) {
// See comment in FileOutlineView.handleRemoval.
guard self.treeController.isEditable else { return }
let existingUrls = changeTreeNode.children?
.compactMap { $0.node?.url } ?? []
let newNodes = newChildUrls
@ -277,6 +284,13 @@ class FileOutlineView: NSOutlineView,
private func handleRemoval(
changeTreeNode: NSTreeNode, newChildUrls: Set<URL>
) {
// FileOutlineView is deinit'ed a bit after Neovim is closed.
// If Neovim deletes for example a temporary file, then handleRemoval is
// called after the self.content is frozen. Thus, we make the controller
// not editable when unbinding, see FileOutlineView.unbindTreeController,
// and check here before modifying.
guard self.treeController.isEditable else { return }
let indexPathsToRemove =
changeTreeNode.children?
.filter { child in
@ -285,6 +299,15 @@ class FileOutlineView: NSOutlineView,
}
.map { $0.indexPath } ?? []
changeTreeNode.children?
.filter { child in
guard let url = child.node?.url else { return true }
return newChildUrls.contains(url) == false
}
.forEach { treeNode in
self.log.default(treeNode.node)
}
self.treeController.removeObjects(
atArrangedObjectIndexPaths: indexPathsToRemove
)
@ -319,6 +342,9 @@ class FileOutlineView: NSOutlineView,
}
private func reloadRoot() {
// See comment in FileOutlineView.handleRemoval.
guard self.treeController.isEditable else { return }
let children = self.childNodes(for: self.root)
self.root.children = children