Revert "fix: refactor autocomplete system for reliability and correct behavior"

This reverts commit 7a87d22.

Author: datlechin

LocalPackages/CodeEditSourceEditor/Sources/CodeEditSourceEditor/CodeSuggestion/Model/CodeSuggestionDelegate.swift

@@ -11,8 +11,7 @@ public protocol CodeSuggestionDelegate: AnyObject {
 
     func completionSuggestionsRequested(
         textView: TextViewController,
-        cursorPosition: CursorPosition,
-        isManualTrigger: Bool
+        cursorPosition: CursorPosition
     ) async -> (windowPosition: CursorPosition, items: [CodeSuggestionEntry])?
 
     // This can't be async, we need it to be snappy. At most, it should just be filtering completion items
@@ -37,19 +36,4 @@ public extension CodeSuggestionDelegate {
     func completionTriggerCharacters() -> Set<String> { [] }
     func completionWindowDidClose() { }
     func completionWindowDidSelect(item: CodeSuggestionEntry) { }
-
-    func completionSuggestionsRequested(
-        textView: TextViewController,
-        cursorPosition: CursorPosition,
-        isManualTrigger: Bool
-    ) async -> (windowPosition: CursorPosition, items: [CodeSuggestionEntry])? {
-        await completionSuggestionsRequested(textView: textView, cursorPosition: cursorPosition)
-    }
-
-    func completionSuggestionsRequested(
-        textView: TextViewController,
-        cursorPosition: CursorPosition
-    ) async -> (windowPosition: CursorPosition, items: [CodeSuggestionEntry])? {
-        nil
-    }
 }

LocalPackages/CodeEditSourceEditor/Sources/CodeEditSourceEditor/CodeSuggestion/Model/SuggestionTriggerCharacterModel.swift

@@ -7,7 +7,6 @@
 
 import AppKit
 import CodeEditTextView
-import os
 import TextStory
 
 /// Triggers the suggestion window when trigger characters are typed.
@@ -18,14 +17,11 @@ import TextStory
 /// essentially a textview delegate ensures both of those promises are upheld.
 @MainActor
 final class SuggestionTriggerCharacterModel {
-    private static let logger = Logger(subsystem: "com.TablePro", category: "CompletionTrigger")
-
     weak var controller: TextViewController?
     private var lastPosition: NSRange?
 
     func textView(_ textView: TextView, didReplaceContentsIn range: NSRange, with string: String) {
         guard let controller, let completionDelegate = controller.completionDelegate else {
-            Self.logger.debug("Typing trigger skipped: controller=\(self.controller == nil ? "nil" : "set"), completionDelegate=\(self.controller?.completionDelegate == nil ? "nil" : "set")")
             return
         }
 

LocalPackages/CodeEditSourceEditor/Sources/CodeEditSourceEditor/CodeSuggestion/Model/SuggestionViewModel.swift

@@ -6,11 +6,9 @@
 //
 
 import AppKit
-import os
 
 @MainActor
 final class SuggestionViewModel: ObservableObject {
-    private static let logger = Logger(subsystem: "com.TablePro", category: "SuggestionVM")
     /// The items to be displayed in the window
     @Published var items: [CodeSuggestionEntry] = []
     @Published var selectedIndex: Int = 0
@@ -74,17 +72,13 @@ final class SuggestionViewModel: ObservableObject {
         textView: TextViewController,
         delegate: CodeSuggestionDelegate,
         cursorPosition: CursorPosition,
-        isManualTrigger: Bool = false,
         showWindowOnParent: @escaping @MainActor (NSWindow, NSRect) -> Void
     ) {
         self.activeTextView = nil
         self.delegate = nil
         itemsRequestTask?.cancel()
 
-        guard let targetParentWindow = textView.view.window else {
-            Self.logger.warning("showCompletions: textView.view.window is nil")
-            return
-        }
+        guard let targetParentWindow = textView.view.window else { return }
 
         self.activeTextView = textView
         self.delegate = delegate
@@ -94,15 +88,11 @@ final class SuggestionViewModel: ObservableObject {
             do {
                 guard let completionItems = await delegate.completionSuggestionsRequested(
                     textView: textView,
-                    cursorPosition: cursorPosition,
-                    isManualTrigger: isManualTrigger
+                    cursorPosition: cursorPosition
                 ) else {
-                    Self.logger.debug("showCompletions: delegate returned nil items")
                     return
                 }
 
-                Self.logger.debug("showCompletions: got \(completionItems.items.count) items")
-
                 try Task.checkCancellation()
                 try await MainActor.run {
                     try Task.checkCancellation()
@@ -114,7 +104,6 @@ final class SuggestionViewModel: ObservableObject {
                           let cursorRect = textView.view.window?.convertToScreen(
                             textView.textView.convert(cursorRect, to: nil)
                           ) else {
-                        Self.logger.warning("showCompletions: cursor rect resolution failed")
                         return
                     }
 
@@ -136,10 +125,7 @@ final class SuggestionViewModel: ObservableObject {
         position: CursorPosition,
         close: () -> Void
     ) {
-        if itemsRequestTask != nil {
-            itemsRequestTask?.cancel()
-            itemsRequestTask = nil
-        }
+        guard itemsRequestTask == nil else { return }
 
         if activeTextView !== textView {
             close()

LocalPackages/CodeEditSourceEditor/Sources/CodeEditSourceEditor/CodeSuggestion/Window/SuggestionController+Window.swift

@@ -8,11 +8,6 @@
 import AppKit
 import SwiftUI
 
-final class SuggestionPanel: NSPanel {
-    override var canBecomeKey: Bool { false }
-    override var canBecomeMain: Bool { false }
-}
-
 extension SuggestionController {
     /// Will constrain the window's frame to be within the visible screen
     public func constrainWindowToScreenEdges(cursorRect: NSRect, font: NSFont) {
@@ -95,26 +90,25 @@ extension SuggestionController {
 
     // MARK: - Private Methods
 
-    static func makeWindow() -> NSPanel {
-        let panel = SuggestionPanel(
+    static func makeWindow() -> NSWindow {
+        let window = NSWindow(
             contentRect: .zero,
             styleMask: [.resizable, .fullSizeContentView, .nonactivatingPanel, .utilityWindow],
             backing: .buffered,
             defer: false
         )
 
-        panel.becomesKeyOnlyIfNeeded = true
-        panel.titleVisibility = .hidden
-        panel.titlebarAppearsTransparent = true
-        panel.isExcludedFromWindowsMenu = true
-        panel.isReleasedWhenClosed = false
-        panel.level = .popUpMenu
-        panel.hasShadow = true
-        panel.isOpaque = false
-        panel.tabbingMode = .disallowed
-        panel.hidesOnDeactivate = true
-        panel.backgroundColor = .clear
-
-        return panel
+        window.titleVisibility = .hidden
+        window.titlebarAppearsTransparent = true
+        window.isExcludedFromWindowsMenu = true
+        window.isReleasedWhenClosed = false
+        window.level = .popUpMenu
+        window.hasShadow = true
+        window.isOpaque = false
+        window.tabbingMode = .disallowed
+        window.hidesOnDeactivate = true
+        window.backgroundColor = .clear
+
+        return window
     }
 }

LocalPackages/CodeEditSourceEditor/Sources/CodeEditSourceEditor/CodeSuggestion/Window/SuggestionController.swift

@@ -89,14 +89,12 @@ public final class SuggestionController: NSWindowController {
         textView: TextViewController,
         delegate: CodeSuggestionDelegate,
         cursorPosition: CursorPosition,
-        isManualTrigger: Bool = false,
         asPopover: Bool = false
     ) {
         model.showCompletions(
             textView: textView,
             delegate: delegate,
-            cursorPosition: cursorPosition,
-            isManualTrigger: isManualTrigger
+            cursorPosition: cursorPosition
         ) { parentWindow, cursorRect in
             self.model.updateTheme(from: textView)
 

LocalPackages/CodeEditSourceEditor/Sources/CodeEditSourceEditor/Controller/TextViewController+Lifecycle.swift

@@ -206,7 +206,6 @@ extension TextViewController {
 
     func handleEvent(event: NSEvent) -> NSEvent? {
         let modifierFlags = event.modifierFlags.intersection(.deviceIndependentFlagsMask)
-            .subtracting([.capsLock, .function])
         switch event.type {
         case .keyDown:
             let tabKey: UInt16 = 0x30
@@ -310,8 +309,7 @@ extension TextViewController {
             SuggestionController.shared.showCompletions(
                 textView: self,
                 delegate: completionDelegate,
-                cursorPosition: cursorPosition,
-                isManualTrigger: true
+                cursorPosition: cursorPosition
             )
             return nil
         }

LocalPackages/CodeEditSourceEditor/Sources/CodeEditSourceEditor/SourceEditor/SourceEditor.swift

@@ -90,8 +90,8 @@ public struct SourceEditor: NSViewControllerRepresentable {
     var highlightProviders: [any HighlightProviding]?
     var undoManager: CEUndoManager?
     var coordinators: [any TextViewCoordinator]
-    var completionDelegate: CodeSuggestionDelegate?
-    var jumpToDefinitionDelegate: JumpToDefinitionDelegate?
+    weak var completionDelegate: CodeSuggestionDelegate?
+    weak var jumpToDefinitionDelegate: JumpToDefinitionDelegate?
 
     public typealias NSViewControllerType = TextViewController
 

TablePro/Core/Autocomplete/CompletionEngine.swift

@@ -51,10 +51,6 @@ final class CompletionEngine {
         provider.updateFavoriteKeywords(keywords)
     }
 
-    func retrySchemaIfNeeded() async {
-        await provider.retrySchemaIfNeeded()
-    }
-
     /// Get completions for the given text and cursor position
     /// This is a pure function - no side effects
     func getCompletions(

TablePro/Core/Autocomplete/SQLCompletionProvider.swift

@@ -59,10 +59,6 @@ final class SQLCompletionProvider {
         self.favoriteKeywords = keywords
     }
 
-    func retrySchemaIfNeeded() async {
-        await schemaProvider.retryLoadSchemaIfNeeded()
-    }
-
     // MARK: - Public API
 
     /// Get completion suggestions for the current cursor position

TablePro/Core/Autocomplete/SQLSchemaProvider.swift

@@ -18,8 +18,6 @@ actor SQLSchemaProvider {
     private let maxCachedTables = 50
     private var isLoading = false
     private var lastLoadError: Error?
-    private var lastRetryAttempt: Date?
-    private let retryCooldown: TimeInterval = 30
 
     // Store a weak driver reference to avoid retaining it after disconnect (MEM-9)
     private weak var cachedDriver: (any DatabaseDriver)?
@@ -85,15 +83,6 @@ actor SQLSchemaProvider {
         }
     }
 
-    func retryLoadSchemaIfNeeded() async {
-        guard lastLoadError != nil, tables.isEmpty, !isLoading else { return }
-        guard let driver = cachedDriver else { return }
-        if let last = lastRetryAttempt, Date().timeIntervalSince(last) < retryCooldown { return }
-        lastRetryAttempt = Date()
-        lastLoadError = nil
-        await loadSchema(using: driver, connection: connectionInfo)
-    }
-
     /// Check if schema is loaded
     func isSchemaLoaded() -> Bool {
         !tables.isEmpty