Project navigator files watch fixes (#1452)

* project navigator files watch

* add comments

* fix lint

Author: avinizhanov

CodeEdit/Features/CEWorkspace/Models/CEWorkspaceFileManager.swift

@@ -187,33 +187,28 @@ final class CEWorkspaceFileManager {
     /// - Parameter events: An array of events that occurred.
     private func fileSystemEventReceived(events: [DirectoryEventStream.Event]) {
         DispatchQueue.main.async {
-            var eventHandledCount = 0
+            var files: Set<CEWorkspaceFile> = []
             for event in events {
-                var directory = event.directory
-                if directory.last == "/" {
-                    directory.removeLast()
-                }
-                guard let item = self.getFile(directory) else {
+                // Event returns file/folder that was changed, but in tree we need to update it's parent
+                let parent = "/" + event.path.split(separator: "/").dropLast().joined(separator: "/")
+                guard let parentItem = self.getFile(parent) else {
                     return
                 }
+
                 switch event.eventType {
-                case .changeInDirectory, .itemChangedOwner, .itemCloned, .itemModified, .itemRenamed, .itemCreated:
-                    try? self.rebuildFiles(fromItem: item)
+                case .changeInDirectory, .itemChangedOwner, .itemModified:
+                    // Can be ignored for now, these I think not related to tree changes
+                    continue
                 case .rootChanged:
                     // TODO: Handle workspace root changing.
                     continue
-                case .itemRemoved:
-                    // Update the file's parent.
-                    if let parent = item.parent {
-                        try? self.rebuildFiles(fromItem: parent)
-                    } else {
-                        try? self.rebuildFiles(fromItem: item)
-                    }
+                case .itemCreated, .itemCloned, .itemRemoved, .itemRenamed:
+                    try? self.rebuildFiles(fromItem: parentItem)
+                    files.insert(parentItem)
                 }
-                eventHandledCount += 1
             }
-            if eventHandledCount > 0 {
-                self.notifyObservers(updatedItems: Set(events.compactMap { self.getFile($0.directory) }))
+            if !files.isEmpty {
+                self.notifyObservers(updatedItems: files)
             }
         }
     }
@@ -237,8 +232,10 @@ final class CEWorkspaceFileManager {
         )
 
         // test for deleted children, and remove them from the index
+        // Folders may or may not have slash at the end, this will normalize check
+        let directoryContentsUrlsRelativePaths = directoryContentsUrls.map({ $0.relativePath })
         for (idx, oldURL) in (childrenMap[fileItem.id] ?? []).map({ URL(filePath: $0) }).enumerated().reversed()
-        where !directoryContentsUrls.contains(oldURL) {
+        where !directoryContentsUrlsRelativePaths.contains(oldURL.relativePath) {
             flattenedFileItems.removeValue(forKey: oldURL.relativePath)
             childrenMap[fileItem.id]?.remove(at: idx)
         }

CodeEdit/Features/CEWorkspace/Models/DirectoryEventStream.swift

@@ -41,9 +41,8 @@ class DirectoryEventStream {
     private let debounceDuration: TimeInterval
 
     struct Event {
-        let directory: String
+        let path: String
         let eventType: FSEvent
-        let deepRebuild: Bool
     }
 
     /// Initialize the event stream and begin listening for events.
@@ -85,9 +84,14 @@ class DirectoryEventStream {
             pathsToWatch,
             UInt64(kFSEventStreamEventIdSinceNow),
             debounceDuration,
-            UInt32(
-                kFSEventStreamCreateFlagNoDefer
-                & kFSEventStreamCreateFlagWatchRoot
+            FSEventStreamCreateFlags(
+                kFSEventStreamCreateFlagUseCFTypes
+                // This will listen for file changes
+                | kFSEventStreamCreateFlagFileEvents
+                // This provides additional information, like fileId,
+                // it is useful when file renamed, because it's firing to separate events with old and new path,
+                // but they can be linked by file id
+                | kFSEventStreamCreateFlagUseExtendedData
             )
         ) {
             self.streamRef = ref
@@ -124,18 +128,23 @@ class DirectoryEventStream {
         _ eventFlags: UnsafePointer<FSEventStreamEventFlags>,
         _ eventIds: UnsafePointer<FSEventStreamEventId>
     ) {
-        let eventPaths = eventPaths.bindMemory(to: UnsafePointer<CChar>.self, capacity: numEvents)
+        guard let eventDictionaries = unsafeBitCast(eventPaths, to: NSArray.self) as? [NSDictionary] else {
+            return
+        }
+
         var events: [Event] = []
-        for idx in 0..<numEvents {
-            let pathPtr = eventPaths.advanced(by: idx).pointee
-            let path = String(cString: pathPtr)
-            let flags = eventFlags.advanced(by: idx).pointee
-            let deepScan = Int(flags) & kFSEventStreamEventFlagMustScanSubDirs > 0 ? true : false // Deep scan?
-            guard let event = getEventFromFlags(flags) else {
+
+        for (index, dictionary) in eventDictionaries.enumerated() {
+            // Get get file id use dictionary[kFSEventStreamEventExtendedFileIDKey] as? UInt64
+            guard let path = dictionary[kFSEventStreamEventExtendedDataPathKey] as? String,
+                  let event = getEventFromFlags(eventFlags[index])
+            else {
                 continue
             }
-            events.append(Event(directory: path, eventType: event, deepRebuild: deepScan))
+
+            events.append(.init(path: path, eventType: event))
         }
+
         callback(events)
     }
 

CodeEdit/Features/NavigatorArea/FindNavigator/FindNavigatorModeSelector.swift

@@ -39,7 +39,7 @@ struct FindNavigatorModeSelector: View {
             if let firstMode = selectedMode.first {
                 newSelectedMode.append(contentsOf: [firstMode, searchMode])
                 if let thirdMode = searchMode.children.first {
-                    if let selectedThirdMode = selectedMode.third, (searchMode.children.contains(selectedThirdMode)) {
+                    if let selectedThirdMode = selectedMode.third, searchMode.children.contains(selectedThirdMode) {
                         newSelectedMode.append(selectedThirdMode)
                     } else {
                         newSelectedMode.append(thirdMode)

CodeEdit/Features/NavigatorArea/ProjectNavigator/OutlineView/ProjectNavigatorOutlineView.swift

@@ -68,9 +68,12 @@ struct ProjectNavigatorOutlineView: NSViewControllerRepresentable {
         var controller: ProjectNavigatorViewController?
 
         func fileManagerUpdated(updatedItems: Set<CEWorkspaceFile>) {
+            guard let outlineView = controller?.outlineView else { return }
+
             for item in updatedItems {
-                controller?.outlineView?.reloadItem(item)
+                outlineView.reloadItem(item, reloadChildren: true)
             }
+
             controller?.updateSelection(itemID: workspace.editorManager.activeEditor.selectedTab?.id)
         }