Small updates

Author: FastestMolasses

Package.resolved

@@ -42,6 +42,7 @@ public struct CodeEditSourceEditor: NSViewControllerRepresentable {
     ///                    character's width between characters, etc. Defaults to `1.0`
     ///   - bracketPairHighlight: The type of highlight to use to highlight bracket pairs.
     ///                           See `BracketPairHighlight` for more information. Defaults to `nil`
+    ///   - useSystemCursor: If true, uses the system cursor on `>=macOS 14`.
     ///   - undoManager: The undo manager for the text view. Defaults to `nil`, which will create a new CEUndoManager
     ///   - coordinators: Any text coordinators for the view to use. See ``TextViewCoordinator`` for more information.
     public init(
@@ -190,7 +191,6 @@ public struct CodeEditSourceEditor: NSViewControllerRepresentable {
 
     public typealias NSViewControllerType = TextViewController
 
-    // TODO: SET COMPLETIONPROVIDER FOR TEXTVIEW
     public func makeNSViewController(context: Context) -> TextViewController {
         let controller = TextViewController(
             string: "",
@@ -235,7 +235,6 @@ public struct CodeEditSourceEditor: NSViewControllerRepresentable {
         Coordinator(text: text, cursorPositions: cursorPositions)
     }
 
-    // TODO: SET COMPLETIONPROVIDER FOR TEXTVIEW
     public func updateNSViewController(_ controller: TextViewController, context: Context) {
         if !context.coordinator.isUpdateFromTextView {
             // Prevent infinite loop of update notifications
@@ -302,6 +301,10 @@ public struct CodeEditSourceEditor: NSViewControllerRepresentable {
             controller.letterSpacing = letterSpacing
         }
 
+        if controller.useSystemCursor != useSystemCursor {
+            controller.useSystemCursor = useSystemCursor
+        }
+
         controller.bracketPairHighlight = bracketPairHighlight
     }
 
@@ -322,7 +325,8 @@ public struct CodeEditSourceEditor: NSViewControllerRepresentable {
         controller.indentOption == indentOption &&
         controller.tabWidth == tabWidth &&
         controller.letterSpacing == letterSpacing &&
-        controller.bracketPairHighlight == bracketPairHighlight
+        controller.bracketPairHighlight == bracketPairHighlight &&
+        controller.useSystemCursor == useSystemCursor
     }
 }
 

Sources/CodeEditSourceEditor/CodeEditSourceEditor/CodeEditSourceEditor.swift

@@ -9,17 +9,16 @@ import AppKit
 
 extension SuggestionController {
     /// Will constrain the window's frame to be within the visible screen
-    public func constrainWindowToScreenEdges(cursorRect: NSRect) {
+    public func constrainWindowToScreenEdges(cursorRect: NSRect, horizontalOffset: CGFloat) {
         guard let window = self.window,
               let screenFrame = window.screen?.visibleFrame else {
             return
         }
 
         let windowSize = window.frame.size
         let padding: CGFloat = 22
-        // TODO: PASS IN OFFSET
         var newWindowOrigin = NSPoint(
-            x: cursorRect.origin.x - Self.WINDOW_PADDING - 13 - 16.5,
+            x: cursorRect.origin.x - Self.WINDOW_PADDING - horizontalOffset,
             y: cursorRect.origin.y
         )
 
@@ -237,7 +236,8 @@ extension SuggestionController: NSTableViewDataSource, NSTableViewDelegate {
     }
 
     public func tableView(_ tableView: NSTableView, viewFor tableColumn: NSTableColumn?, row: Int) -> NSView? {
-        (items[row] as? any CodeSuggestionEntry)?.view
+        guard row >= 0, row < items.count else { return nil }
+        return (items[row] as? any CodeSuggestionEntry)?.view
     }
 
     public func tableView(_ tableView: NSTableView, rowViewForRow row: Int) -> NSTableRowView? {
@@ -254,6 +254,7 @@ extension SuggestionController: NSTableViewDataSource, NSTableViewDelegate {
     }
 }
 
+/// Used to draw a custom selection highlight for the table row
 private class CodeSuggestionRowView: NSTableRowView {
     override func drawSelection(in dirtyRect: NSRect) {
         guard isSelected else { return }

Sources/CodeEditSourceEditor/CodeSuggestion/SuggestionController+Window.swift

@@ -252,11 +252,3 @@ public final class SuggestionController: NSWindowController {
         removeEventMonitors()
     }
 }
-
-public protocol SuggestionControllerDelegate: AnyObject {
-    func applyCompletionItem(item: CompletionItem)
-    func onClose()
-    func onCompletion()
-    func onCursorMove()
-    func onItemSelect(item: CompletionItem)
-}

Sources/CodeEditSourceEditor/CodeSuggestion/SuggestionController.swift

@@ -0,0 +1,16 @@
+//
+//  SuggestionControllerDelegate.swift
+//  CodeEditSourceEditor
+//
+//  Created by Abe Malla on 12/26/24.
+//
+
+import LanguageServerProtocol
+
+public protocol SuggestionControllerDelegate: AnyObject {
+    func applyCompletionItem(item: CompletionItem)
+    func onClose()
+    func onCompletion()
+    func onCursorMove()
+    func onItemSelect(item: CompletionItem)
+}