Add a fallback solution for fetchCurrentProjectRootURL

Author: intitni

Core/Sources/Service/AutoTrigger.swift

@@ -22,7 +22,8 @@ actor AutoTrigger {
                     triggerTask = Task { @ServiceActor in
                         try? await Task.sleep(nanoseconds: 2_000_000_000)
                         if Task.isCancelled { return }
-                        guard let folderURL = try? await Environment.fetchCurrentProjectRootURL(),
+                        let fileURL = try? await Environment.fetchCurrentFileURL()
+                        guard let folderURL = try? await Environment.fetchCurrentProjectRootURL(fileURL),
                               let workspace = workspaces[folderURL],
                               workspace.isRealtimeSuggestionEnabled
                         else { return }

Core/Sources/Service/Environment.swift

@@ -17,7 +17,7 @@ private struct FailedToFetchFileURLError: Error, LocalizedError {
 enum Environment {
     static var now = { Date() }
 
-    static var fetchCurrentProjectRootURL: () async throws -> URL? = {
+    static var fetchCurrentProjectRootURL: (_ fileURL: URL?) async throws -> URL? = { fileURL in
         let appleScript = """
         tell application "Xcode"
             return path of document of the first window
@@ -34,7 +34,20 @@ enum Environment {
             }
             return url
         }
-        return nil
+        
+        guard var currentURL = fileURL else { return nil }
+        var firstDirectoryURL: URL? = nil
+        while currentURL.pathComponents.count > 1 {
+            defer { currentURL.deleteLastPathComponent() }
+            guard FileManager.default.fileIsDirectory(atPath: currentURL.path) else { continue }
+            if firstDirectoryURL == nil { firstDirectoryURL = currentURL }
+            let gitURL = currentURL.appendingPathComponent(".git")
+            if FileManager.default.fileIsDirectory(atPath: gitURL.path) {
+                return currentURL
+            }
+        }
+        
+        return firstDirectoryURL ?? fileURL
     }
 
     static var fetchCurrentFileURL: () async throws -> URL = {

Core/Sources/Service/Helpers.swift

@@ -3,8 +3,8 @@ import Foundation
 extension FileManager {
     func fileIsDirectory(atPath path: String) -> Bool {
         var isDirectory: ObjCBool = false
-        fileExists(atPath: path, isDirectory: &isDirectory)
-        return isDirectory.boolValue
+        let exists = fileExists(atPath: path, isDirectory: &isDirectory)
+        return isDirectory.boolValue && exists
     }
 }
 

Core/Sources/Service/XPCService.swift

@@ -271,7 +271,7 @@ public class XPCService: NSObject, XPCServiceProtocol {
 extension XPCService {
     @ServiceActor
     func fetchOrCreateWorkspaceIfNeeded(fileURL: URL) async throws -> Workspace {
-        let projectURL = try await Environment.fetchCurrentProjectRootURL()
+        let projectURL = try await Environment.fetchCurrentProjectRootURL(fileURL)
         let workspaceURL = projectURL ?? fileURL
         let workspace = workspaces[workspaceURL] ?? Workspace(projectRootURL: workspaceURL)
         workspaces[workspaceURL] = workspace