Discard suggestion when cursor moved to another line

Author: intitni

Core/Sources/Service/RealtimeSuggestionController.swift

@@ -9,6 +9,7 @@ import Foundation
 import Logger
 import Preferences
 import QuartzCore
+import XcodeInspector
 
 @ServiceActor
 public class RealtimeSuggestionController {
@@ -48,9 +49,6 @@ public class RealtimeSuggestionController {
                     await self.handleXcodeChanged(app)
                 }
 
-                #warning(
-                    "TODO: Is it possible to get rid of hid event observation with only AXObserver?"
-                )
                 if ActiveApplicationMonitor.activeXcode != nil {
                     await startHIDObservation(by: 1)
                 } else {
@@ -127,7 +125,7 @@ public class RealtimeSuggestionController {
             let notificationsFromEditor = AXNotificationStream(
                 app: activeXcode,
                 element: focusElement,
-                notificationNames: kAXValueChangedNotification
+                notificationNames: kAXValueChangedNotification, kAXSelectedTextChangedNotification
             )
 
             for await notification in notificationsFromEditor {
@@ -139,6 +137,14 @@ public class RealtimeSuggestionController {
                 case kAXValueChangedNotification:
                     self.triggerPrefetchDebounced()
                     await self.notifyEditingFileChange(editor: focusElement)
+                case kAXSelectedTextChangedNotification:
+                    guard let editor = sourceEditor else { continue }
+                    let sourceEditor = SourceEditor(
+                        runningApplication: activeXcode,
+                        element: editor
+                    )
+                    await PseudoCommandHandler()
+                        .invalidateRealtimeSuggestionsIfNeeded(sourceEditor: sourceEditor)
                 default:
                     continue
                 }
@@ -177,13 +183,6 @@ public class RealtimeSuggestionController {
 
         let keycode = Int(event.getIntegerValueField(.keyboardEventKeycode))
         let escape = 0x35
-        let arrowKeys = [0x7B, 0x7C, 0x7D, 0x7E]
-
-        // Arrow keys should cancel in-flight tasks.
-        if arrowKeys.contains(keycode) {
-            await cancelInFlightTasks()
-            return
-        }
 
         // Escape should cancel in-flight tasks.
         // Except that when the completion panel is presented, it should trigger prefetch instead.

Core/Sources/Service/SuggestionCommandHandler/PseudoCommandHandler.swift

@@ -1,9 +1,10 @@
 import ActiveApplicationMonitor
 import AppKit
-import SuggestionModel
 import Environment
 import Preferences
 import SuggestionInjector
+import SuggestionModel
+import XcodeInspector
 import XPCShared
 
 /// It's used to run some commands without really triggering the menu bar item.
@@ -54,6 +55,19 @@ struct PseudoCommandHandler {
         }
     }
 
+    func invalidateRealtimeSuggestionsIfNeeded(sourceEditor: SourceEditor) async {
+        guard let fileURL = try? await Environment.fetchCurrentFileURL(),
+              let (_, filespace) = try? await Workspace
+              .fetchOrCreateWorkspaceIfNeeded(fileURL: fileURL) else { return }
+
+        if await !filespace.validateSuggestions(
+            lines: sourceEditor.content.lines,
+            cursorPosition: sourceEditor.content.cursorPosition
+        ) {
+            PresentInWindowSuggestionPresenter().discardSuggestion(fileURL: fileURL)
+        }
+    }
+
     func rejectSuggestions() async {
         let handler = WindowBaseCommandHandler()
         _ = try? await handler.rejectSuggestion(editor: .init(
@@ -214,7 +228,7 @@ extension PseudoCommandHandler {
         let content = focusElement.value
         let split = content.breakLines()
         let range = convertRangeToCursorRange(selectionRange, in: content)
-        return (content, split, [range], range.end)
+        return (content, split, [range], range.start)
     }
 
     func getFileURL() async -> URL? {
@@ -289,10 +303,10 @@ extension PseudoCommandHandler {
         var countE = 0
         var cursorRange = CursorRange(start: .zero, end: .outOfScope)
         for (i, line) in lines.enumerated() {
-            if countS <= range.lowerBound && range.lowerBound < countS + line.count {
+            if countS <= range.lowerBound, range.lowerBound < countS + line.count {
                 cursorRange.start = .init(line: i, character: range.lowerBound - countS)
             }
-            if countE <= range.upperBound && range.upperBound < countE + line.count {
+            if countE <= range.upperBound, range.upperBound < countE + line.count {
                 cursorRange.end = .init(line: i, character: range.upperBound - countE)
                 break
             }
@@ -321,3 +335,4 @@ public extension String {
         return all
     }
 }
+

Core/Sources/Service/Workspace.swift

@@ -67,6 +67,20 @@ final class Filespace {
     func refreshUpdateTime() {
         lastSuggestionUpdateTime = Environment.now()
     }
+    
+    func validateSuggestions(lines: [String], cursorPosition: CursorPosition) -> Bool {
+        if cursorPosition.line != suggestionSourceSnapshot.cursorPosition.line {
+            reset()
+            return false
+        }
+        
+        guard cursorPosition.line >= 0, cursorPosition.line < lines.count else {
+            reset()
+            return false
+        }
+        
+        return true
+    }
 }
 
 // MARK: - Workspace

Core/Sources/XcodeInspector/SourceEditor.swift

@@ -34,7 +34,7 @@ public class SourceEditor {
                 content: content,
                 lines: split,
                 selections: [range],
-                cursorPosition: range.end,
+                cursorPosition: range.start,
                 lineAnnotations: lineAnnotations
             )
         }