wip

Author: datlechin

TablePro/Core/Autocomplete/SQLContextAnalyzer.swift

@@ -135,11 +135,34 @@ final class SQLContextAnalyzer {
         }
     }()
 
-    /// Pre-compiled regex for removing strings and comments
-    private static let singleQuoteStringRegex = try! NSRegularExpression(pattern: "'[^']*'")
-    private static let doubleQuoteStringRegex = try! NSRegularExpression(pattern: "\"[^\"]*\"")
-    private static let blockCommentRegex = try! NSRegularExpression(pattern: "/\\*[\\s\\S]*?\\*/")
-    private static let lineCommentRegex = try! NSRegularExpression(pattern: "--[^\n]*")
+    /// Pre-compiled regex for removing strings and comments (force-unwrap safe: simple patterns)
+    private static let singleQuoteStringRegex: NSRegularExpression = {
+        guard let regex = try? NSRegularExpression(pattern: "'[^']*'") else {
+            fatalError("Failed to compile singleQuoteStringRegex - invalid pattern")
+        }
+        return regex
+    }()
+    
+    private static let doubleQuoteStringRegex: NSRegularExpression = {
+        guard let regex = try? NSRegularExpression(pattern: "\"[^\"]*\"") else {
+            fatalError("Failed to compile doubleQuoteStringRegex - invalid pattern")
+        }
+        return regex
+    }()
+    
+    private static let blockCommentRegex: NSRegularExpression = {
+        guard let regex = try? NSRegularExpression(pattern: "/\\*[\\s\\S]*?\\*/") else {
+            fatalError("Failed to compile blockCommentRegex - invalid pattern")
+        }
+        return regex
+    }()
+    
+    private static let lineCommentRegex: NSRegularExpression = {
+        guard let regex = try? NSRegularExpression(pattern: "--[^\n]*") else {
+            fatalError("Failed to compile lineCommentRegex - invalid pattern")
+        }
+        return regex
+    }()
 
     // MARK: - Main Analysis
 
@@ -624,21 +647,29 @@ final class SQLContextAnalyzer {
         var result = text
 
         // Use pre-compiled regex patterns for performance
-        if let regex = Self.singleQuoteStringRegex {
-            result = regex.stringByReplacingMatches(in: result, range: NSRange(result.startIndex..., in: result), withTemplate: "''")
-        }
+        result = Self.singleQuoteStringRegex.stringByReplacingMatches(
+            in: result,
+            range: NSRange(result.startIndex..., in: result),
+            withTemplate: "''"
+        )
 
-        if let regex = Self.doubleQuoteStringRegex {
-            result = regex.stringByReplacingMatches(in: result, range: NSRange(result.startIndex..., in: result), withTemplate: "\"\"")
-        }
+        result = Self.doubleQuoteStringRegex.stringByReplacingMatches(
+            in: result,
+            range: NSRange(result.startIndex..., in: result),
+            withTemplate: "\"\""
+        )
 
-        if let regex = Self.blockCommentRegex {
-            result = regex.stringByReplacingMatches(in: result, range: NSRange(result.startIndex..., in: result), withTemplate: "")
-        }
+        result = Self.blockCommentRegex.stringByReplacingMatches(
+            in: result,
+            range: NSRange(result.startIndex..., in: result),
+            withTemplate: ""
+        )
 
-        if let regex = Self.lineCommentRegex {
-            result = regex.stringByReplacingMatches(in: result, range: NSRange(result.startIndex..., in: result), withTemplate: "")
-        }
+        result = Self.lineCommentRegex.stringByReplacingMatches(
+            in: result,
+            range: NSRange(result.startIndex..., in: result),
+            withTemplate: ""
+        )
 
         return result
     }

TablePro/Views/Editor/EditorTextView.swift

@@ -24,6 +24,9 @@ final class EditorTextView: NSTextView {
     /// Callback when user clicks at a different position (to dismiss completion)
     var onClickOutsideCompletion: (() -> Void)?
 
+    /// Track the last cursor position for smart invalidation
+    private var lastCursorLine: Int = -1
+    
     // MARK: - Auto-Pairing Configuration
 
     private let bracketPairs: [Character: Character] = [
@@ -56,9 +59,6 @@ final class EditorTextView: NSTextView {
         commonInit()
     }
 
-    /// Track the last cursor position for smart invalidation
-    private var lastCursorLine: Int = -1
-    
     private func commonInit() {
         // Observe selection changes for visual updates
         NotificationCenter.default.addObserver(
@@ -150,22 +150,41 @@ final class EditorTextView: NSTextView {
         lastCursorLine = currentLine
     }
 
+    /// Simple cache for line lookups to avoid repeated O(n) scans for consecutive lines
+    private var lineCache: (lastLine: Int, charIndex: Int, searchRange: NSRange)?
+    
     /// Get the rect for a specific line number using efficient NSString lineRange
     private func lineRectForLine(_ lineNumber: Int, layoutManager: NSLayoutManager, textContainer: NSTextContainer) -> NSRect? {
         guard layoutManager.numberOfGlyphs > 0 else { return nil }
 
         let text = string as NSString
         guard text.length > 0 else { return nil }
 
-        // Find the character index for the target line using NSString's lineRange
         var charIndex = 0
         var searchRange = NSRange(location: 0, length: text.length)
+        var startLine = 0
+        
+        // Use cache if we're looking for a nearby line (common case: prev/current line)
+        if let cache = lineCache, abs(cache.lastLine - lineNumber) <= 1 {
+            if cache.lastLine == lineNumber {
+                // Exact cache hit
+                charIndex = cache.charIndex
+                searchRange = cache.searchRange
+                startLine = lineNumber
+            } else if cache.lastLine + 1 == lineNumber {
+                // Next line after cached (common: moving from prev to current)
+                charIndex = cache.charIndex
+                searchRange = cache.searchRange
+                startLine = cache.lastLine
+            }
+        }
 
-        // Iterate to the target line
-        for _ in 0..<lineNumber {
+        // Iterate from cached position (or start) to the target line
+        for _ in startLine..<lineNumber {
             guard searchRange.location < text.length else {
                 // Line number is beyond document, clamp to last valid position
                 charIndex = max(0, text.length - 1)
+                lineCache = nil // Invalidate cache for out-of-bounds
                 break
             }
 
@@ -174,11 +193,12 @@ final class EditorTextView: NSTextView {
             // Move to next line
             searchRange.location = NSMaxRange(lineRange)
             searchRange.length = text.length - searchRange.location
-            
-            // Set charIndex to the start of the next line
             charIndex = searchRange.location
         }
 
+        // Cache the result for next lookup
+        lineCache = (lineNumber, charIndex, searchRange)
+        
         // If we reached the target line, charIndex is already set to its start
         // Otherwise it was clamped to the last valid position