Update

Author: intitni

Tool/Sources/Environment/Environment.swift

@@ -41,8 +41,8 @@ public enum Environment {
             return false
         }
     }
-
-    public static var fetchCurrentProjectRootURLFromXcode: () async throws -> URL? = {
+    
+    public static var fetchCurrentWorkspaceURLFromXcode: () async throws -> URL? = {
         if let xcode = ActiveApplicationMonitor.shared.activeXcode
             ?? ActiveApplicationMonitor.shared.latestXcode
         {
@@ -53,11 +53,6 @@ public enum Environment {
                     let path = child.description
                     let trimmedNewLine = path.trimmingCharacters(in: .newlines)
                     var url = URL(fileURLWithPath: trimmedNewLine)
-                    while !FileManager.default.fileIsDirectory(atPath: url.path) ||
-                        !url.pathExtension.isEmpty
-                    {
-                        url = url.deletingLastPathComponent()
-                    }
                     return url
                 }
             }
@@ -66,6 +61,19 @@ public enum Environment {
         return nil
     }
 
+    public static var fetchCurrentProjectRootURLFromXcode: () async throws -> URL? = {
+        if var url = try await fetchCurrentWorkspaceURLFromXcode() {
+            while !FileManager.default.fileIsDirectory(atPath: url.path) ||
+                !url.pathExtension.isEmpty
+            {
+                url = url.deletingLastPathComponent()
+            }
+            return url
+        }
+
+        return nil
+    }
+
     public static var guessProjectRootURLForFile: (_ fileURL: URL) async throws -> URL = {
         fileURL in
         var currentURL = fileURL
@@ -250,7 +258,7 @@ func runAppleScript(_ appleScript: String) async throws -> String {
     }
 }
 
-extension FileManager {
+public extension FileManager {
     func fileIsDirectory(atPath path: String) -> Bool {
         var isDirectory: ObjCBool = false
         let exists = fileExists(atPath: path, isDirectory: &isDirectory)

Tool/Sources/Workspace/Workspace.swift

@@ -30,6 +30,7 @@ public class WorkspacePropertyValues {
 open class WorkspacePlugin {
     public private(set) weak var workspace: Workspace?
     public var projectRootURL: URL { workspace?.projectRootURL ?? URL(fileURLWithPath: "/") }
+    public var workspaceURL: URL { workspace?.workspaceURL ?? projectRootURL }
     public var filespaces: [URL: Filespace] { workspace?.filespaces ?? [:] }
 
     public init(workspace: Workspace) {
@@ -57,6 +58,7 @@ public final class Workspace {
 
     var additionalProperties = WorkspacePropertyValues()
     public internal(set) var plugins = [ObjectIdentifier: WorkspacePlugin]()
+    public let workspaceURL: URL
     public let projectRootURL: URL
     public let openedFileRecoverableStorage: OpenedFileRecoverableStorage
     public private(set) var lastSuggestionUpdateTime = Environment.now()
@@ -84,8 +86,18 @@ public final class Workspace {
         plugins[ObjectIdentifier(type)] as? P
     }
 
-    init(projectRootURL: URL) {
-        self.projectRootURL = projectRootURL
+    init(workspaceURL: URL) {
+        self.workspaceURL = workspaceURL
+        self.projectRootURL = {
+            var url = workspaceURL
+            while !FileManager.default.fileIsDirectory(atPath: url.path) ||
+                !url.pathExtension.isEmpty
+            {
+                url = url.deletingLastPathComponent()
+            }
+            return url
+
+        }()
         openedFileRecoverableStorage = .init(projectRootURL: projectRootURL)
         let openedFiles = openedFileRecoverableStorage.openedFiles
         Task { @WorkspaceActor in
@@ -134,7 +146,7 @@ public final class Workspace {
     public func closeFilespace(fileURL: URL) {
         filespaces[fileURL] = nil
     }
-    
+
     @WorkspaceActor
     public func didUpdateFilespace(fileURL: URL, content: String) {
         guard let filespace = filespaces[fileURL] else { return }

Tool/Sources/Workspace/WorkspacePool.swift

@@ -56,14 +56,14 @@ public class WorkspacePool {
         }
 
         // If we know which project is opened.
-        if let currentProjectURL = try await Environment.fetchCurrentProjectRootURLFromXcode() {
-            if let existed = workspaces[currentProjectURL] {
+        if let currentWorkspaceURL = try await Environment.fetchCurrentWorkspaceURLFromXcode() {
+            if let existed = workspaces[currentWorkspaceURL] {
                 let filespace = existed.createFilespaceIfNeeded(fileURL: fileURL)
                 return (existed, filespace)
             }
 
-            let new = createNewWorkspace(projectRootURL: currentProjectURL)
-            workspaces[currentProjectURL] = new
+            let new = createNewWorkspace(workspaceURL: currentWorkspaceURL)
+            workspaces[currentWorkspaceURL] = new
             let filespace = new.createFilespaceIfNeeded(fileURL: fileURL)
             return (new, filespace)
         }
@@ -93,7 +93,7 @@ public class WorkspacePool {
                     return workspace
                 }
             }
-            return createNewWorkspace(projectRootURL: workspaceURL)
+            return createNewWorkspace(workspaceURL: workspaceURL)
         }()
 
         let filespace = workspace.createFilespaceIfNeeded(fileURL: fileURL)
@@ -121,8 +121,8 @@ extension WorkspacePool {
         workspace.plugins[id] = nil
     }
 
-    func createNewWorkspace(projectRootURL: URL) -> Workspace {
-        let new = Workspace(projectRootURL: projectRootURL)
+    func createNewWorkspace(workspaceURL: URL) -> Workspace {
+        let new = Workspace(workspaceURL: workspaceURL)
         for (id, plugin) in plugins {
             addPlugin(plugin, id: id, to: new)
         }