Rollback a0efc09 Disable fetchCurrentProjectRootURL

Author: intitni

Core/Sources/Environment/Environment.swift

@@ -41,43 +41,42 @@ public enum Environment {
     }
 
     #warning("""
-    The current version causes an issue in real-time suggestion that when completion panel is own,
-    the command handler can not find the correct workspace, so we are not using it for now.
+    TODO: The current version causes an issue in real-time suggestion that when completion panel is open,
+    the command handler can not find the correct workspace.
     """)
     public static var fetchCurrentProjectRootURL: (_ fileURL: URL?) async throws
         -> URL? = { fileURL in
-            return URL(fileURLWithPath: "/")
-//            let appleScript = """
-//            tell application "Xcode"
-//                return path of document of the first window
-//            end tell
-//            """
-//
-//            let path = (try? await runAppleScript(appleScript)) ?? ""
-//            if !path.isEmpty {
-//                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
-//            }
-//
-//            guard var currentURL = fileURL else { return nil }
-//            var firstDirectoryURL: URL?
-//            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
+            let appleScript = """
+            tell application "Xcode"
+                return path of document of the first window
+            end tell
+            """
+
+            let path = (try? await runAppleScript(appleScript)) ?? ""
+            if !path.isEmpty {
+                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
+            }
+
+            guard var currentURL = fileURL else { return nil }
+            var firstDirectoryURL: URL?
+            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
         }
 
     public static var fetchCurrentFileURL: () async throws -> URL = {

Core/Sources/Service/RealtimeSuggestionController.swift

@@ -166,7 +166,7 @@ public class RealtimeSuggestionController {
                     #warning(
                         "TODO: Any method to avoid using AppleScript to check that completion panel is presented?"
                     )
-                    if isCommentMode, await Environment.frontmostXcodeWindowIsEditor() {
+                    if await Environment.frontmostXcodeWindowIsEditor() {
                         if Task.isCancelled { return }
                         self.triggerPrefetchDebounced(force: true)
                     }
@@ -191,12 +191,7 @@ public class RealtimeSuggestionController {
 
             os_log(.info, "Prefetch suggestions.")
 
-            let isCommentMode = PresentationMode(
-                rawValue: UserDefaults.shared
-                    .integer(forKey: SettingsKey.suggestionPresentationMode)
-            ) == .comment
-
-            if isCommentMode, !force, await !Environment.frontmostXcodeWindowIsEditor() {
+            if !force, await !Environment.frontmostXcodeWindowIsEditor() {
                 os_log(.info, "Completion panel is open, blocked.")
                 return
             }