Fix: #1035 finding in project bug (#1268)

fix: #1035 finding in project bug

- No results display when finding
- Found results count

Author: RayZhao1998

CodeEdit/Features/Documents/WorkspaceDocument+Search.swift

@@ -17,9 +17,6 @@ extension WorkspaceDocument {
         ]
         @Published var searchResult: [SearchResultModel] = []
         @Published var searchResultCount: Int = 0
-        /// A unique ID for the current search results. Used to "re-search" with the same
-        /// search text but refresh results and UI.
-        @Published var searchId: UUID?
 
         var ignoreCase: Bool = true
 
@@ -40,13 +37,12 @@ extension WorkspaceDocument {
             guard let text else {
                 searchResult = []
                 searchResultCount = 0
-                searchId = nil
                 return
             }
 
             let textToCompare = ignoreCase ? text.lowercased() : text
             self.searchResult = []
-            self.searchId = UUID()
+            self.searchResultCount = 0
             guard let url = self.workspace.fileURL else { return }
             let enumerator = FileManager.default.enumerator(
                 at: url,
@@ -109,7 +105,7 @@ extension WorkspaceDocument {
                                 lineMatches: matches
                             )
                         }
-                        searchResultCount += 1
+                        searchResultCount += matches.count
                     }
                 }
 

CodeEdit/Features/NavigatorSidebar/FindNavigator/FindNavigatorResultList/FindNavigatorListViewController.swift

@@ -12,7 +12,6 @@ final class FindNavigatorListViewController: NSViewController {
     public var workspace: WorkspaceDocument
     public var selectedItem: Any?
 
-    private var searchId: UUID?
     private var searchItems: [SearchResultModel] = []
     private var scrollView: NSScrollView!
     private var outlineView: NSOutlineView!
@@ -64,15 +63,10 @@ final class FindNavigatorListViewController: NSViewController {
 
     /// Updates the view with new search results and updates the UI.
     /// - Parameter searchItems: The search items to set.
-    /// - Parameter searchText: The search text, used to preserve result deletions across view updates.
-    public func updateNewSearchResults(_ searchItems: [SearchResultModel], searchId: UUID?) {
-        if searchId != self.searchId {
-            self.searchItems = searchItems
-            outlineView.reloadData()
-            outlineView.expandItem(nil, expandChildren: true)
-
-            self.searchId = searchId
-        }
+    public func updateNewSearchResults(_ searchItems: [SearchResultModel]) {
+        self.searchItems = searchItems
+        outlineView.reloadData()
+        outlineView.expandItem(nil, expandChildren: true)
 
         if let selectedItem {
             selectSearchResult(selectedItem)

CodeEdit/Features/NavigatorSidebar/FindNavigator/FindNavigatorResultList/FindNavigatorResultList.swift

@@ -27,8 +27,7 @@ struct FindNavigatorResultList: NSViewControllerRepresentable {
 
     func updateNSViewController(_ nsViewController: FindNavigatorListViewController, context: Context) {
         nsViewController.updateNewSearchResults(
-            workspace.searchState?.searchResult ?? [],
-            searchId: workspace.searchState?.searchId
+            workspace.searchState?.searchResult ?? []
         )
         if nsViewController.rowHeight != projectNavigatorSize.rowHeight {
             nsViewController.rowHeight = projectNavigatorSize.rowHeight
@@ -48,12 +47,9 @@ struct FindNavigatorResultList: NSViewControllerRepresentable {
             self.controller = controller
             super.init()
             self.listener = state?
-                .searchResult
-                .publisher
-                .receive(on: RunLoop.main)
-                .collect()
+                .$searchResult
                 .sink(receiveValue: { [weak self] searchResults in
-                    self?.controller?.updateNewSearchResults(searchResults, searchId: state?.searchId)
+                    self?.controller?.updateNewSearchResults(searchResults)
                 })
         }
 

CodeEdit/Features/NavigatorSidebar/FindNavigator/FindNavigatorView.swift

@@ -26,13 +26,11 @@ struct FindNavigatorView: View {
 
     @State var currentFilter: String = ""
 
-    private var foundFilesCount: Int {
-        state.searchResult.count
-    }
+    @State
+    private var foundFilesCount: Int = 0
 
-    private var foundResultsCount: Int {
-        state.searchResult.count
-    }
+    @State
+    private var searchResultCount: Int = 0
 
     var body: some View {
         VStack {
@@ -82,7 +80,7 @@ struct FindNavigatorView: View {
             .padding(.vertical, 5)
             Divider()
             HStack(alignment: .center) {
-                Text("\(state.searchResultCount) results in \(foundFilesCount) files")
+                Text("\(self.searchResultCount) results in \(self.foundFilesCount) files")
                     .font(.system(size: 10))
             }
             Divider()
@@ -91,5 +89,9 @@ struct FindNavigatorView: View {
         .onSubmit {
             state.search(searchText)
         }
+        .onReceive(state.objectWillChange) { _ in
+            self.searchResultCount = state.searchResultCount
+            self.foundFilesCount = state.searchResult.count
+        }
     }
 }