fix: address code review issues in autocomplete refactor

Author: datlechin

LocalPackages/CodeEditSourceEditor/Sources/CodeEditSourceEditor/CodeSuggestion/View/CodeSuggestionLabelView.swift

@@ -33,36 +33,34 @@ struct CodeSuggestionLabelView: View {
 
     // swiftlint:disable shorthand_operator
     private func highlightedLabel() -> Text {
-        let label = suggestion.label
+        let nsLabel = suggestion.label as NSString
         let ranges = suggestion.matchedRanges
         let color = effectiveLabelColor
 
         guard !ranges.isEmpty else {
-            return Text(label).foregroundColor(color)
+            return Text(suggestion.label).foregroundColor(color)
         }
 
         var result = Text("")
         var currentIndex = 0
 
         for range in ranges {
-            let clampedUpper = min(range.upperBound, label.count)
+            let clampedUpper = min(range.upperBound, nsLabel.length)
             guard range.lowerBound < clampedUpper else { continue }
 
             if currentIndex < range.lowerBound {
-                let start = label.index(label.startIndex, offsetBy: currentIndex)
-                let end = label.index(label.startIndex, offsetBy: range.lowerBound)
-                result = result + Text(label[start..<end]).foregroundColor(color)
+                let segment = nsLabel.substring(with: NSRange(location: currentIndex, length: range.lowerBound - currentIndex))
+                result = result + Text(segment).foregroundColor(color)
             }
 
-            let start = label.index(label.startIndex, offsetBy: range.lowerBound)
-            let end = label.index(label.startIndex, offsetBy: clampedUpper)
-            result = result + Text(label[start..<end]).foregroundColor(color).bold()
+            let segment = nsLabel.substring(with: NSRange(location: range.lowerBound, length: clampedUpper - range.lowerBound))
+            result = result + Text(segment).foregroundColor(color).bold()
             currentIndex = clampedUpper
         }
 
-        if currentIndex < label.count {
-            let start = label.index(label.startIndex, offsetBy: currentIndex)
-            result = result + Text(label[start...]).foregroundColor(color)
+        if currentIndex < nsLabel.length {
+            let segment = nsLabel.substring(from: currentIndex)
+            result = result + Text(segment).foregroundColor(color)
         }
 
         return result

LocalPackages/CodeEditSourceEditor/Sources/CodeEditSourceEditor/CodeSuggestion/View/SuggestionContentView.swift

@@ -48,6 +48,9 @@ struct SuggestionContentView: View {
                     .lineLimit(1)
                     .truncationMode(.tail)
                     .contentShape(Rectangle())
+                    .onTapGesture(count: 1) {
+                        model.selectedIndex = index
+                    }
                     .onTapGesture(count: 2) {
                         model.selectedIndex = index
                         if let selectedItem = model.selectedItem {
@@ -57,9 +60,6 @@ struct SuggestionContentView: View {
                             )
                         }
                     }
-                    .onTapGesture(count: 1) {
-                        model.selectedIndex = index
-                    }
                     .listRowInsets(EdgeInsets())
                     .listRowBackground(
                         RoundedRectangle(cornerRadius: 5)
@@ -86,10 +86,13 @@ struct SuggestionContentView: View {
 
     private var contentWidth: CGFloat {
         let font = model.activeTextView?.font ?? NSFont.systemFont(ofSize: 12)
-        // Icon (pointSize + 2) + spacing(2) + label padding (13*2) + extra buffer
         let iconWidth = font.pointSize + 6
         let maxLabelLength = min(
-            (model.items.reduce(0) { max($0, $1.label.count + ($1.detail?.count ?? 0)) }) + 2,
+            model.items.reduce(0) { current, item in
+                let labelLen = (item.label as NSString).length
+                let detailLen = ((item.detail ?? "") as NSString).length
+                return max(current, labelLen + detailLen)
+            } + 2,
             64
         )
         let textWidth = CGFloat(maxLabelLength) * font.charWidth

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

@@ -51,21 +51,26 @@ public final class SuggestionController: NSWindowController {
         let hostingView = NSHostingView(rootView: contentView)
         window.contentView = hostingView
 
+        // Resize window when items change
         model.$items
             .receive(on: DispatchQueue.main)
             .sink { [weak self] _ in
-                DispatchQueue.main.async {
-                    self?.updateWindowSizeFromContent()
-                }
+                self?.updateWindowSizeFromContent()
             }
             .store(in: &sizeObservers)
 
+        // Resize window only when preview visibility changes (not every arrow key)
         model.$selectedIndex
             .receive(on: DispatchQueue.main)
+            .map { [weak self] index -> Bool in
+                guard let self, index >= 0, index < self.model.items.count else { return false }
+                let item = self.model.items[index]
+                return item.documentation != nil || item.sourcePreview != nil
+                    || !(item.pathComponents?.isEmpty ?? true)
+            }
+            .removeDuplicates()
             .sink { [weak self] _ in
-                DispatchQueue.main.async {
-                    self?.updateWindowSizeFromContent()
-                }
+                self?.updateWindowSizeFromContent()
             }
             .store(in: &sizeObservers)
 
@@ -154,6 +159,11 @@ public final class SuggestionController: NSWindowController {
         model.willClose()
         removeEventMonitors()
 
+        if let observer = windowResignObserver {
+            NotificationCenter.default.removeObserver(observer)
+            windowResignObserver = nil
+        }
+
         if let observer = firstResponderObserver {
             NotificationCenter.default.removeObserver(observer)
             firstResponderObserver = nil

TablePro/Core/Autocomplete/SQLCompletionProvider.swift

@@ -28,9 +28,8 @@ final class SQLCompletionProvider {
     /// Context-aware suggestion limit: schema-heavy clauses get more results
     private func maxSuggestions(for clauseType: SQLClauseType) -> Int {
         switch clauseType {
-        case .from, .join, .into, .dropObject, .createIndex:
-            return 40
-        case .select, .where_, .and, .on, .having, .groupBy, .orderBy,
+        case .from, .join, .into, .dropObject, .createIndex,
+             .select, .where_, .and, .on, .having, .groupBy, .orderBy,
              .set, .insertColumns, .returning, .using:
             return 40
         default:
@@ -624,16 +623,20 @@ final class SQLCompletionProvider {
     private func populateMatchRanges(_ items: inout [SQLCompletionItem], prefix: String) {
         guard !prefix.isEmpty else { return }
         let lowerPrefix = prefix.lowercased()
+        let nsPrefix = lowerPrefix as NSString
 
         for i in items.indices {
-            let filterText = items[i].filterText
-            if filterText.hasPrefix(lowerPrefix) {
-                items[i].matchedRanges = [0..<lowerPrefix.count]
-            } else if let range = filterText.range(of: lowerPrefix) {
-                let start = filterText.distance(from: filterText.startIndex, to: range.lowerBound)
-                items[i].matchedRanges = [start..<(start + lowerPrefix.count)]
-            } else if let result = fuzzyMatchWithIndices(pattern: lowerPrefix, target: filterText) {
-                items[i].matchedRanges = indicesToRanges(result.indices)
+            let nsFilterText = items[i].filterText as NSString
+            let prefixRange = nsFilterText.range(of: lowerPrefix, options: .anchored)
+            if prefixRange.location != NSNotFound {
+                items[i].matchedRanges = [0..<nsPrefix.length]
+            } else {
+                let containsRange = nsFilterText.range(of: lowerPrefix)
+                if containsRange.location != NSNotFound {
+                    items[i].matchedRanges = [containsRange.location..<(containsRange.location + containsRange.length)]
+                } else if let result = fuzzyMatchWithIndices(pattern: lowerPrefix, target: items[i].filterText) {
+                    items[i].matchedRanges = indicesToRanges(result.indices)
+                }
             }
         }
     }