Sort alphabetically - Folders on top (#2028)

* Sort alphabetically - Folders on top

* Changed `Button` to `Toggle`

Author: LeonardoLarranaga

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

@@ -65,11 +65,15 @@ struct ProjectNavigatorOutlineView: NSViewControllerRepresentable {
                 .store(in: &cancellables)
             workspace.$navigatorFilter
                 .throttle(for: 0.1, scheduler: RunLoop.main, latest: true)
-                .sink { [weak self] _ in self?.controller?.handleFilterChange() }
+                .sink { [weak self] _ in
+                    self?.controller?.handleFilterChange()
+                }
                 .store(in: &cancellables)
-            workspace.$sourceControlFilter
+            Publishers.Merge(workspace.$sourceControlFilter, workspace.$sortFoldersOnTop)
                 .throttle(for: 0.1, scheduler: RunLoop.main, latest: true)
-                .sink { [weak self] _ in self?.controller?.handleFilterChange() }
+                .sink { [weak self] _ in
+                    self?.controller?.handleFilterChange()
+                }
                 .store(in: &cancellables)
         }
 

CodeEdit/Features/NavigatorArea/ProjectNavigator/OutlineView/ProjectNavigatorViewController+NSOutlineViewDataSource.swift

@@ -12,19 +12,29 @@ extension ProjectNavigatorViewController: NSOutlineViewDataSource {
     private func getOutlineViewItems(for item: CEWorkspaceFile) -> [CEWorkspaceFile] {
         if let cachedChildren = filteredContentChildren[item] {
             return cachedChildren
+                .sorted { lhs, rhs in
+                    workspace?.sortFoldersOnTop == true ? lhs.isFolder && !rhs.isFolder : lhs.name < rhs.name
+                }
         }
 
-        if let children = workspace?.workspaceFileManager?.childrenOfFile(item) {
-            if let filter = workspace?.navigatorFilter, let sourceControlFilter = workspace?.sourceControlFilter,
-                !filter.isEmpty || sourceControlFilter {
+        if let workspace, let children = workspace.workspaceFileManager?.childrenOfFile(item) {
+            if !workspace.navigatorFilter.isEmpty || workspace.sourceControlFilter {
                 let filteredChildren = children.filter {
-                    fileSearchMatches(filter, for: $0, sourceControlFilter: sourceControlFilter)
+                    fileSearchMatches(
+                        workspace.navigatorFilter,
+                        for: $0,
+                        sourceControlFilter: workspace.sourceControlFilter
+                    )
                 }
+
                 filteredContentChildren[item] = filteredChildren
                 return filteredChildren
             }
 
             return children
+                .sorted { lhs, rhs in
+                    workspace.sortFoldersOnTop ? lhs.isFolder && !rhs.isFolder : lhs.name < rhs.name
+                }
         }
 
         return []

CodeEdit/Features/NavigatorArea/ProjectNavigator/ProjectNavigatorToolbarBottom.swift

@@ -27,10 +27,15 @@ struct ProjectNavigatorToolbarBottom: View {
                 text: $workspace.navigatorFilter,
                 leadingAccessories: {
                     FilterDropDownIconButton(menu: {
-                        Button {
-                            workspace.sortFoldersOnTop.toggle()
-                        } label: {
-                            Text(workspace.sortFoldersOnTop ? "Alphabetically" : "Folders on top")
+                        ForEach([(true, "Folders on top"), (false, "Alphabetically")], id: \.0) { value, title in
+                            Toggle(title, isOn: Binding(get: {
+                                workspace.sortFoldersOnTop == value
+                            }, set: { _ in
+                                // Avoid calling the handleFilterChange method
+                                if workspace.sortFoldersOnTop != value {
+                                    workspace.sortFoldersOnTop = value
+                                }
+                            }))
                         }
                     }, isOn: !workspace.navigatorFilter.isEmpty)
                     .padding(.leading, 4)