Addressed PR issues

Author: austincondiff

CodeEdit/Features/Documents/WorkspaceDocument/WorkspaceDocument+Find.swift

@@ -129,9 +129,7 @@ extension WorkspaceDocument.SearchState {
                         )
 
                         if let result = result {
-                            await MainActor.run {
-                                self.tempSearchResults.append(result)
-                            }
+                            await self.appendNewResultsToTempResults(newResult: result)
                         }
                         evaluateResultGroup.leave()
                     }
@@ -356,6 +354,16 @@ extension WorkspaceDocument.SearchState {
         }
     }
 
+    /// Evaluates a matched file to determine if it contains any search matches.
+    /// Requires a file score from the search model.
+    ///
+    /// Evaluates the file's contents asynchronously.
+    ///
+    /// - Parameters:
+    ///   - fileURL: The `URL` of the file to evaluate.
+    ///   - fileScore:  The file's score from a ``SearchIndexer``
+    ///   - regexPattern: The pattern to evaluate against the file's contents.
+    /// - Returns: `nil` if there are no relevant search matches, or a search result if matches are found.
     private func evaluateSearchResult(
         fileURL: URL,
         fileScore: Float,

CodeEdit/Features/Editor/TabBar/Tabs/Tab/EditorTabCloseButton.swift

@@ -104,3 +104,18 @@ struct EditorTabCloseButton: View {
         }
     }
 }
+
+@available(macOS 14.0, *)
+#Preview {
+    @Previewable @State var closeButtonGestureActive: Bool = false
+    @Previewable @State var isHoveringClose: Bool = false
+
+    return EditorTabCloseButton(
+        isActive: false,
+        isHoveringTab: false,
+        isDragging: false,
+        closeAction: { print("Close tab") },
+        closeButtonGestureActive: $closeButtonGestureActive,
+        isHoveringClose: $isHoveringClose
+    )
+}

CodeEdit/Features/OpenQuickly/Views/OpenQuicklyView.swift

@@ -7,6 +7,12 @@
 
 import SwiftUI
 
+extension URL: @retroactive Identifiable {
+    public var id: String {
+        absoluteString
+    }
+}
+
 struct OpenQuicklyView: View {
     @EnvironmentObject private var workspace: WorkspaceDocument
 

CodeEdit/Features/Welcome/Views/WelcomeView.swift

@@ -27,7 +27,7 @@ struct WelcomeView: View {
 
     @State var showGitClone = false
 
-    @State private var showCheckoutBranchItem: IdentifiableURL?
+    @State var showCheckoutBranchItem: URL?
 
     @State var isHovering: Bool = false
 
@@ -122,16 +122,16 @@ struct WelcomeView: View {
         .sheet(isPresented: $showGitClone) {
             GitCloneView(
                 openBranchView: { url in
-                    showCheckoutBranchItem = IdentifiableURL(url: url)
+                    showCheckoutBranchItem = url
                 },
                 openDocument: { url in
                     openDocument(url, dismissWindow)
                 }
             )
         }
-        .sheet(item: $showCheckoutBranchItem) { wrapper in
+        .sheet(item: $showCheckoutBranchItem) { url in
             GitCheckoutBranchView(
-                repoLocalPath: wrapper.url,
+                repoLocalPath: url,
                 openDocument: { url in
                     openDocument(url, dismissWindow)
                 }

CodeEdit/Utils/ShellClient/Models/ShellClient.swift

@@ -8,6 +8,12 @@
 import Combine
 import Foundation
 
+/// Errors that can occur during shell operations
+enum ShellClientError: Error {
+    case failedToDecodeOutput
+    case taskTerminated(code: Int)
+}
+
 /// Shell Client
 /// Run commands in shell
 class ShellClient {
@@ -38,9 +44,7 @@ class ShellClient {
         try task.run()
         let data = pipe.fileHandleForReading.readDataToEndOfFile()
         guard let output = String(bytes: data, encoding: .utf8) else {
-            throw NSError(domain: "ShellClient", code: -1, userInfo: [
-                NSLocalizedDescriptionKey: "Failed to decode command output"
-            ])
+            throw ShellClientError.failedToDecodeOutput
         }
         return output
     }
@@ -71,6 +75,7 @@ class ShellClient {
                     return
                 }
                 guard let output = String(bytes: data, encoding: .utf8) else {
+                    subject.send(completion: .finished)
                     return
                 }
                 output.split(whereSeparator: \.isNewline)
@@ -92,19 +97,15 @@ class ShellClient {
                 let data = fileHandle.availableData
                 if !data.isEmpty {
                     guard let output = String(bytes: data, encoding: .utf8) else {
-                        continuation.finish(throwing: NSError(
-                            domain: "ShellClient",
-                            code: -1,
-                            userInfo: [NSLocalizedDescriptionKey: "Failed to decode command output"]
-                        ))
+                        continuation.finish(throwing: ShellClientError.failedToDecodeOutput)
                         return
                     }
                     output.split(whereSeparator: \.isNewline)
                         .forEach({ continuation.yield(String($0)) })
                 } else {
                     if !task.isRunning && task.terminationStatus != 0 {
                         continuation.finish(
-                            throwing: NSError(domain: "ShellClient", code: Int(task.terminationStatus))
+                            throwing: ShellClientError.taskTerminated(code: Int(task.terminationStatus))
                         )
                     } else {
                         continuation.finish()

CodeEditTests/Features/TerminalEmulator/Shell/ShellTests.swift

@@ -24,7 +24,7 @@ final class ShellTests: XCTestCase {
         super.tearDown()
     }
 
-    func testExecuteCommandWithShellInitialization() {
+    func testExecuteCommandWithShellInitialization() throws {
         let command = "echo $STATE"
         let environmentVariables = ["STATE": "Testing"]
         let shell: Shell = .bash
@@ -45,17 +45,13 @@ final class ShellTests: XCTestCase {
 
         // Additional assertion to check output
         let outputData = outputPipe.fileHandleForReading.readDataToEndOfFile()
-        if let outputString = String(
-            bytes: outputData,
-            encoding: .utf8
-        )?.trimmingCharacters(in: .whitespacesAndNewlines) {
-            XCTAssertTrue(outputString.contains("Testing"))
-        } else {
-            XCTFail("Failed to decode output data")
-        }
+        let outputString = try XCTUnwrap(
+            String(bytes: outputData, encoding: .utf8)?.trimmingCharacters(in: .whitespacesAndNewlines)
+        )
+        XCTAssertTrue(outputString.contains("Testing"))
     }
 
-    func testExecuteCommandWithShellOutput() {
+    func testExecuteCommandWithShellOutput() throws {
         let command = "echo $STATE"
         let environmentVariables = ["STATE": "Testing"]
         let shell: Shell = .bash
@@ -69,14 +65,10 @@ final class ShellTests: XCTestCase {
         ))
 
         let outputData = outputPipe.fileHandleForReading.readDataToEndOfFile()
-        if let outputString = String(
-            bytes: outputData,
-            encoding: .utf8
-        )?.trimmingCharacters(in: .whitespacesAndNewlines) {
-            XCTAssertTrue(outputString.contains("Testing"))
-        } else {
-            XCTFail("Failed to decode output data")
-        }
+        let outputString = try XCTUnwrap(
+            String(bytes: outputData, encoding: .utf8)?.trimmingCharacters(in: .whitespacesAndNewlines)
+        )
+        XCTAssertTrue(outputString.contains("Testing"))
     }
 
     func testExecuteCommandWithExecutableOverrideAttempt() {