Support open file from search result list

Author: RayZhao1998

CodeEdit/Documents/WorkspaceDocument.swift

@@ -179,7 +179,7 @@ extension WorkspaceDocument {
     class SearchState: ObservableObject {
 
         var workspace: WorkspaceDocument
-        @Published var searchResult: [URL: [AttributedString]] = [:]
+        @Published var searchResult: [WorkspaceClient.FileItem: [AttributedString]] = [:]
 
         init(_ workspace: WorkspaceDocument) {
             self.workspace = workspace
@@ -196,8 +196,10 @@ extension WorkspaceDocument {
                                                                     .skipsPackageDescendants
                                                                 ])
                 if let filePaths = enumerator?.allObjects as? [URL] {
-                    filePaths.forEach { fileURL in
-                        let data = try? String(contentsOf: fileURL)
+                    filePaths.map { url in
+                        WorkspaceClient.FileItem(url: url, children: nil)
+                    }.forEach { fileItem in
+                        let data = try? String(contentsOf: fileItem.url)
                         data?.split(separator: "\n").forEach { line in
                             let noSpaceLine = line.trimmingCharacters(in: .whitespaces)
                             if noSpaceLine.contains(text) {
@@ -213,9 +215,9 @@ extension WorkspaceDocument {
                                     attributedString.append(
                                         AttributedString(String(noSpaceLine[range.upperBound..<noSpaceLine.endIndex]))
                                     )
-                                    var lines = self.searchResult[fileURL] ?? []
+                                    var lines = self.searchResult[fileItem] ?? []
                                     lines.append(attributedString)
-                                    self.searchResult[fileURL] = lines
+                                    self.searchResult[fileItem] = lines
                                 }
                             }
                         }

CodeEdit/SideBar/Search/FindResultList.swift

@@ -6,16 +6,17 @@
 //
 
 import SwiftUI
+import WorkspaceClient
 
 struct FindResultList: View {
     @ObservedObject var state: WorkspaceDocument.SearchState
     @State var selectedResult: AttributedString?
 
     var body: some View {
         List(selection: $selectedResult) {
-            ForEach(Array(state.searchResult.keys), id: \.self) { fileURL in
+            ForEach(Array(state.searchResult.keys), id: \.self) { (file: WorkspaceClient.FileItem) in
                 Section {
-                    ForEach(state.searchResult[fileURL] ?? [], id: \.self) { line in
+                    ForEach(state.searchResult[file] ?? [], id: \.self) { line in
                         HStack(alignment: .top) {
                             Image(systemName: "text.alignleft")
                                 .font(.system(size: 12))
@@ -27,15 +28,18 @@ struct FindResultList: View {
                         }
                         .padding(.leading, 15)
                         .tag(line)
+                        .onTapGesture {
+                            state.workspace.openFile(item: file)
+                        }
                     }
                 } header: {
                     HStack(alignment: .center) {
 //                            Image(nsImage: NSWorkspace.shared.icon(forFile: fileURL.path))
 //                                .frame(width: 13, height: 13)
-                        Text(fileURL.lastPathComponent)
+                        Text(file.url.lastPathComponent)
                             .font(.system(size: 13, weight: .semibold))
                             .foregroundColor(Color(nsColor: NSColor.headerTextColor))
-                        Text(fileURL.path.replacingOccurrences(of: state.workspace.fileURL?.path ?? "", with: ""))
+                        Text(file.url.path.replacingOccurrences(of: state.workspace.fileURL?.path ?? "", with: ""))
                     }
                     .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
                 }