Merge branch 'main' into lsp-install

Author: FastestMolasses

.github/scripts/test_app.sh

@@ -8,6 +8,7 @@ elif [ $1 = "arm" ]; then
     ARCH="arm64"
 fi
 
+echo "Building with Xcode: $(xcodebuild -version)"
 echo "Building with arch: ${ARCH}"
 echo "SwiftLint Version: $(swiftlint --version)"
 

CodeEdit.xcodeproj/project.pbxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1540"
+   LastUpgradeVersion = "1620"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

CodeEdit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -7,6 +7,8 @@
 
 import Foundation
 
+extension WorkspaceDocument.SearchState: @unchecked Sendable {}
+
 extension WorkspaceDocument.SearchState {
     /// Creates a search term based on the given query and search mode.
     ///
@@ -94,9 +96,6 @@ extension WorkspaceDocument.SearchState {
         }
 
         let searchQuery = getSearchTerm(query)
-
-        // The regexPattern is only used for the evaluateFile function
-        // to ensure that the search terms are highlighted correctly
         let regexPattern = getRegexPattern(query)
 
         guard let indexer = indexer else {
@@ -105,24 +104,32 @@ extension WorkspaceDocument.SearchState {
         }
 
         let asyncController = SearchIndexer.AsyncManager(index: indexer)
-
         let evaluateResultGroup = DispatchGroup()
         let evaluateSearchQueue = DispatchQueue(label: "app.codeedit.CodeEdit.EvaluateSearch")
 
         let searchStream = await asyncController.search(query: searchQuery, 20)
         for try await result in searchStream {
             for file in result.results {
+                let fileURL = file.url
+                let fileScore = file.score
+                let capturedRegexPattern = regexPattern
+
                 evaluateSearchQueue.async(group: evaluateResultGroup) {
                     evaluateResultGroup.enter()
-                    Task {
-                        var newResult = SearchResultModel(file: CEWorkspaceFile(url: file.url), score: file.score)
-                        await self.evaluateFile(query: regexPattern, searchResult: &newResult)
-
-                        // Check if the new result has any line matches.
-                        if !newResult.lineMatches.isEmpty {
-                            // The function needs to be called because,
-                            // we are trying to modify the array from within a concurrent context.
-                            self.appendNewResultsToTempResults(newResult: newResult)
+                    Task { [weak self] in
+                        guard let self else {
+                            evaluateResultGroup.leave()
+                            return
+                        }
+
+                        let result = await self.evaluateSearchResult(
+                            fileURL: fileURL,
+                            fileScore: fileScore,
+                            regexPattern: capturedRegexPattern
+                        )
+
+                        if let result = result {
+                            await self.appendNewResultsToTempResults(newResult: result)
                         }
                         evaluateResultGroup.leave()
                     }
@@ -131,33 +138,33 @@ extension WorkspaceDocument.SearchState {
         }
 
         evaluateResultGroup.notify(queue: evaluateSearchQueue) {
-            self.setSearchResults()
+            Task { @MainActor [weak self] in
+                self?.setSearchResults()
+            }
         }
     }
 
     /// Appends a new search result to the temporary search results array on the main thread.
     ///
     /// - Parameters:
     ///   - newResult: The `SearchResultModel` to be appended to the temporary search results.
+    @MainActor
     func appendNewResultsToTempResults(newResult: SearchResultModel) {
-        DispatchQueue.main.async {
-            self.tempSearchResults.append(newResult)
-        }
+        self.tempSearchResults.append(newResult)
     }
 
     /// Sets the search results by updating various properties on the main thread.
     /// This function updates `findNavigatorStatus`, `searchResult`, `searchResultCount`, and `searchResultsFileCount`
     /// and sets the `tempSearchResults` to an empty array.
     /// - Important: Call this function when you are ready to
     /// display or use the final search results.
+    @MainActor
     func setSearchResults() {
-        DispatchQueue.main.async {
-            self.searchResult = self.tempSearchResults.sorted { $0.score > $1.score }
-            self.searchResultsCount = self.tempSearchResults.map { $0.lineMatches.count }.reduce(0, +)
-            self.searchResultsFileCount = self.tempSearchResults.count
-            self.findNavigatorStatus = .found
-            self.tempSearchResults = []
-        }
+        self.searchResult = self.tempSearchResults.sorted { $0.score > $1.score }
+        self.searchResultsCount = self.tempSearchResults.map { $0.lineMatches.count }.reduce(0, +)
+        self.searchResultsFileCount = self.tempSearchResults.count
+        self.findNavigatorStatus = .found
+        self.tempSearchResults = []
     }
 
     /// Evaluates a search query within the content of a file and updates
@@ -183,7 +190,10 @@ extension WorkspaceDocument.SearchState {
         guard let data = try? Data(contentsOf: searchResult.file.url) else {
             return
         }
-        let fileContent = String(decoding: data, as: UTF8.self)
+        guard let fileContent = String(bytes: data, encoding: .utf8) else {
+            await setStatus(.failed(errorMessage: "Failed to decode file content."))
+            return
+        }
 
         // Attempt to create a regular expression from the provided query
         guard let regex = try? NSRegularExpression(
@@ -343,4 +353,29 @@ extension WorkspaceDocument.SearchState {
             self.findNavigatorStatus = .none
         }
     }
+
+    /// 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,
+        regexPattern: String
+    ) async -> SearchResultModel? {
+        var newResult = SearchResultModel(
+            file: CEWorkspaceFile(url: fileURL),
+            score: fileScore
+        )
+
+        await evaluateFile(query: regexPattern, searchResult: &newResult)
+
+        return newResult.lineMatches.isEmpty ? nil : newResult
+    }
 }

CodeEdit.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -105,9 +105,10 @@ struct EditorTabCloseButton: View {
     }
 }
 
+@available(macOS 14.0, *)
 #Preview {
-    @State var closeButtonGestureActive: Bool = false
-    @State var isHoveringClose: Bool = false
+    @Previewable @State var closeButtonGestureActive: Bool = false
+    @Previewable @State var isHoveringClose: Bool = false
 
     return EditorTabCloseButton(
         isActive: false,

CodeEdit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -226,8 +226,6 @@ struct EditorTabView: View {
                         }
                     }
             )
-            // This padding is to avoid background color overlapping with top divider.
-            .padding(.top, 1)
             .zIndex(isActive ? 2 : (isDragging ? 3 : (isPressing ? 1 : 0)))
             .id(item.id)
             .tabBarContextMenu(item: item, isTemporary: isTemporary)