Say goodbye to comment mode

Author: intitni

Core/Sources/Service/GUI/RealtimeSuggestionIndicatorController.swift

@@ -9,7 +9,8 @@ import QuartzCore
 import SwiftUI
 import UserDefaultsObserver
 
-/// Present a tiny dot next to mouse cursor if real-time suggestion is enabled.
+/// Deprecated: This class is no longer in use.
+@available(*, deprecated, message: "This class is no longer in use.")
 @MainActor
 final class RealtimeSuggestionIndicatorController {
     class IndicatorContentViewModel: ObservableObject {
@@ -226,10 +227,8 @@ final class RealtimeSuggestionIndicatorController {
     private func updateIndicatorVisibility() async {
         let isVisible = await {
             let isOn = UserDefaults.shared.value(for: \.realtimeSuggestionToggle)
-            let isCommentMode = UserDefaults.shared
-                .value(for: \.suggestionPresentationMode) == .comment
             let isXcodeActive = await Environment.isXcodeActive()
-            return isOn && isXcodeActive && isCommentMode
+            return isOn && isXcodeActive
         }()
 
         guard window.isVisible != isVisible else { return }

Core/Sources/Service/RealtimeSuggestionController.swift

@@ -28,10 +28,6 @@ public class RealtimeSuggestionController {
     private var focusedUIElement: AXUIElement?
     private var sourceEditor: SourceEditor?
 
-    var isCommentMode: Bool {
-        UserDefaults.shared.value(for: \.suggestionPresentationMode) == .comment
-    }
-
     private nonisolated init() {
         Task { [weak self] in
 
@@ -179,16 +175,6 @@ public class RealtimeSuggestionController {
         if keycode == escape {
             if event.type == .keyDown {
                 await cancelInFlightTasks()
-            } else {
-                Task {
-                    #warning(
-                        "TODO: Any method to avoid using AppleScript to check that completion panel is presented?"
-                    )
-                    if isCommentMode, await Environment.frontmostXcodeWindowIsEditor() {
-                        if Task.isCancelled { return }
-                        self.triggerPrefetchDebounced(force: true)
-                    }
-                }
             }
         }
     }
@@ -214,11 +200,6 @@ public class RealtimeSuggestionController {
 
             Logger.service.info("Prefetch suggestions.")
 
-            if !force, isCommentMode, await !Environment.frontmostXcodeWindowIsEditor() {
-                Logger.service.info("Completion panel is open, blocked.")
-                return
-            }
-
             // So the editor won't be blocked (after information are cached)!
             await PseudoCommandHandler().generateRealtimeSuggestions(sourceEditor: sourceEditor)
         }

Core/Sources/Service/SuggestionCommandHandler/PseudoCommandHandler.swift

@@ -56,15 +56,8 @@ struct PseudoCommandHandler {
         }
 
         // Otherwise, get it from pseudo handler directly.
-        let mode = UserDefaults.shared.value(for: \.suggestionPresentationMode)
-        switch mode {
-        case .comment:
-            let handler = CommentBaseCommandHandler()
-            _ = try? await handler.generateRealtimeSuggestions(editor: editor)
-        case .floatingWidget:
-            let handler = WindowBaseCommandHandler()
-            _ = try? await handler.generateRealtimeSuggestions(editor: editor)
-        }
+        let handler = WindowBaseCommandHandler()
+        _ = try? await handler.generateRealtimeSuggestions(editor: editor)
     }
 
     func invalidateRealtimeSuggestionsIfNeeded(sourceEditor: SourceEditor) async {

Core/Sources/Service/XPCService.swift

@@ -47,14 +47,7 @@ public class XPCService: NSObject, XPCServiceProtocol {
             do {
                 let editor = try JSONDecoder().decode(EditorContent.self, from: editorContent)
                 let mode = UserDefaults.shared.value(for: \.suggestionPresentationMode)
-                let handler: SuggestionCommandHandler = {
-                    switch mode {
-                    case .comment:
-                        return CommentBaseCommandHandler()
-                    case .floatingWidget:
-                        return WindowBaseCommandHandler()
-                    }
-                }()
+                let handler: SuggestionCommandHandler = WindowBaseCommandHandler()
                 try Task.checkCancellation()
                 guard let updatedContent = try await getUpdatedContent(handler, editor) else {
                     reply(nil, nil)

EditorExtension/GetSuggestionsCommand.swift

@@ -10,29 +10,10 @@ class GetSuggestionsCommand: NSObject, XCSourceEditorCommand, CommandType {
         with invocation: XCSourceEditorCommandInvocation,
         completionHandler: @escaping (Error?) -> Void
     ) {
-        switch UserDefaults.shared.value(for: \.suggestionPresentationMode) {
-        case .comment:
-            Task {
-                do {
-                    let service = try getService()
-                    if let content = try await service.getSuggestedCode(
-                        editorContent: .init(invocation)
-                    ) {
-                        invocation.accept(content)
-                    }
-                    completionHandler(nil)
-                } catch is CancellationError {
-                    completionHandler(nil)
-                } catch {
-                    completionHandler(error)
-                }
-            }
-        case .floatingWidget:
-            completionHandler(nil)
-            Task {
-                let service = try getService()
-                _ = try await service.getSuggestedCode(editorContent: .init(invocation))
-            }
+        completionHandler(nil)
+        Task {
+            let service = try getService()
+            _ = try await service.getSuggestedCode(editorContent: .init(invocation))
         }
     }
 }

EditorExtension/NextSuggestionCommand.swift

@@ -10,31 +10,10 @@ class NextSuggestionCommand: NSObject, XCSourceEditorCommand, CommandType {
         with invocation: XCSourceEditorCommandInvocation,
         completionHandler: @escaping (Error?) -> Void
     ) {
-        switch UserDefaults.shared.value(for: \.suggestionPresentationMode) {
-        case .comment:
-            Task {
-                do {
-                    try await (Task(timeout: 7) {
-                        let service = try getService()
-                        if let content = try await service.getNextSuggestedCode(
-                            editorContent: .init(invocation)
-                        ) {
-                            invocation.accept(content)
-                        }
-                        completionHandler(nil)
-                    }.value)
-                } catch is CancellationError {
-                    completionHandler(nil)
-                } catch {
-                    completionHandler(error)
-                }
-            }
-        case .floatingWidget:
-            completionHandler(nil)
-            Task {
-                let service = try getService()
-                _ = try await service.getNextSuggestedCode(editorContent: .init(invocation))
-            }
+        completionHandler(nil)
+        Task {
+            let service = try getService()
+            _ = try await service.getNextSuggestedCode(editorContent: .init(invocation))
         }
     }
 }

EditorExtension/PreviousSuggestionCommand.swift

@@ -10,29 +10,10 @@ class PreviousSuggestionCommand: NSObject, XCSourceEditorCommand, CommandType {
         with invocation: XCSourceEditorCommandInvocation,
         completionHandler: @escaping (Error?) -> Void
     ) {
-        switch UserDefaults.shared.value(for: \.suggestionPresentationMode) {
-        case .comment:
-            Task {
-                do {
-                    let service = try getService()
-                    if let content = try await service.getPreviousSuggestedCode(
-                        editorContent: .init(invocation)
-                    ) {
-                        invocation.accept(content)
-                    }
-                    completionHandler(nil)
-                } catch is CancellationError {
-                    completionHandler(nil)
-                } catch {
-                    completionHandler(error)
-                }
-            }
-        case .floatingWidget:
-            completionHandler(nil)
-            Task {
-                let service = try getService()
-                _ = try await service.getPreviousSuggestedCode(editorContent: .init(invocation))
-            }
+        completionHandler(nil)
+        Task {
+            let service = try getService()
+            _ = try await service.getPreviousSuggestedCode(editorContent: .init(invocation))
         }
     }
 }

EditorExtension/RealtimeSuggestionCommand.swift

@@ -10,29 +10,10 @@ class RealtimeSuggestionsCommand: NSObject, XCSourceEditorCommand, CommandType {
         with invocation: XCSourceEditorCommandInvocation,
         completionHandler: @escaping (Error?) -> Void
     ) {
-        switch UserDefaults.shared.value(for: \.suggestionPresentationMode) {
-        case .comment:
-            Task {
-                do {
-                    let service = try getService()
-                    if let content = try await service.getRealtimeSuggestedCode(
-                        editorContent: .init(invocation)
-                    ) {
-                        invocation.accept(content)
-                    }
-                    completionHandler(nil)
-                } catch is CancellationError {
-                    completionHandler(nil)
-                } catch {
-                    completionHandler(error)
-                }
-            }
-        case .floatingWidget:
-            completionHandler(nil)
-            Task {
-                let service = try getService()
-                _ = try await service.getRealtimeSuggestedCode(editorContent: .init(invocation))
-            }
+        completionHandler(nil)
+        Task {
+            let service = try getService()
+            _ = try await service.getRealtimeSuggestedCode(editorContent: .init(invocation))
         }
     }
 }

EditorExtension/RejectSuggestionCommand.swift

@@ -10,31 +10,10 @@ class RejectSuggestionCommand: NSObject, XCSourceEditorCommand, CommandType {
         with invocation: XCSourceEditorCommandInvocation,
         completionHandler: @escaping (Error?) -> Void
     ) {
-        switch UserDefaults.shared.value(for: \.suggestionPresentationMode) {
-        case .comment:
-            Task {
-                do {
-                    try await (Task(timeout: 7) {
-                        let service = try getService()
-                        if let content = try await service.getSuggestionRejectedCode(
-                            editorContent: .init(invocation)
-                        ) {
-                            invocation.accept(content)
-                        }
-                        completionHandler(nil)
-                    }.value)
-                } catch is CancellationError {
-                    completionHandler(nil)
-                } catch {
-                    completionHandler(error)
-                }
-            }
-        case .floatingWidget:
-            completionHandler(nil)
-            Task {
-                let service = try getService()
-                _ = try await service.getSuggestionRejectedCode(editorContent: .init(invocation))
-            }
+        completionHandler(nil)
+        Task {
+            let service = try getService()
+            _ = try await service.getSuggestionRejectedCode(editorContent: .init(invocation))
         }
     }
 }

Tool/Sources/Preferences/PresentationMode.swift

@@ -1,4 +1,4 @@
 public enum PresentationMode: Int, CaseIterable {
-    case comment = 0
+    case nearbyTextCursor = 0
     case floatingWidget = 1
 }