Merge branch 'mac' into scrolling

Author: simonbs

…tView/Navigation/GoToLineSelection.swift …ne/TextView/Core/GoToLineSelection.swiftSources/Runestone/TextView/Navigation/GoToLineSelection.swift renamed to Sources/Runestone/TextView/Core/GoToLineSelection.swift Sources/Runestone/TextView/Navigation/GoToLineSelection.swift renamed to Sources/Runestone/TextView/Core/GoToLineSelection.swift

@@ -85,7 +85,10 @@ final class LayoutManager {
     var lineHeightMultiplier: CGFloat = 1
     var constrainingLineWidth: CGFloat {
         if isLineWrappingEnabled {
-            return scrollViewWidth - textContainerInset.left - textContainerInset.right - safeAreaInsets.left - safeAreaInsets.right
+            return scrollViewWidth
+            - gutterWidthService.gutterWidth
+            - textContainerInset.left - textContainerInset.right
+            - safeAreaInsets.left - safeAreaInsets.right
         } else {
             // Rendering multiple very long lines is very expensive. In order to let the editor remain useable,
             // we set a very high maximum line width when line wrapping is disabled.

Sources/Runestone/TextView/Core/LayoutManager.swift

@@ -4,17 +4,16 @@ import AppKit
 extension TextView: NSTextInputClient {
     // swiftlint:disable:next prohibited_super_call
     override public func doCommand(by selector: Selector) {
-        #if DEBUG
-        print(NSStringFromSelector(selector))
-        #endif
+//        #if DEBUG
+//        print(NSStringFromSelector(selector))
+//        #endif
         super.doCommand(by: selector)
     }
 
     public func insertText(_ string: Any, replacementRange: NSRange) {
         guard let string = string as? String else {
             return
         }
-        textViewController.selectionService.resetPreviouslySelectedRange()
         let range = replacementRange.location == NSNotFound ? textViewController.rangeForInsertingText : replacementRange
         if textViewController.shouldChangeText(in: range, replacementText: string) {
             textViewController.replaceText(in: range, with: string)

Sources/Runestone/TextView/Core/LineNavigationService.swift

@@ -497,6 +497,7 @@ open class TextView: NSView {
         textViewController.layoutIfNeeded()
         textViewController.handleContentSizeUpdateIfNeeded()
         updateCaretFrame()
+        updateSelectedRectangles()
     }
 
     override public func layoutSubtreeIfNeeded() {
@@ -517,6 +518,33 @@ open class TextView: NSView {
         }
     }
 
+    override public func mouseDown(with event: NSEvent) {
+        super.mouseDown(with: event)
+        if let location = locationClosestToPoint(in: event) {
+            textViewController.move(to: location)
+            textViewController.startDraggingSelection(from: location)
+        }
+    }
+
+    override public func mouseDragged(with event: NSEvent) {
+        super.mouseDragged(with: event)
+        if let location = locationClosestToPoint(in: event) {
+            textViewController.extendDraggedSelection(to: location)
+        }
+    }
+
+    override public func mouseUp(with event: NSEvent) {
+        super.mouseUp(with: event)
+        if let location = locationClosestToPoint(in: event) {
+            textViewController.extendDraggedSelection(to: location)
+        }
+    }
+
+    override public func resetCursorRects() {
+        super.resetCursorRects()
+        addCursorRect(bounds, cursor: .iBeam)
+    }
+
     /// Sets the current _state_ of the editor. The state contains the text to be displayed by the editor and
     /// various additional information about the text that the editor needs to show the text.
     ///
@@ -538,7 +566,6 @@ public extension TextView {
         guard var selectedRange = textViewController.markedRange ?? textViewController.selectedRange?.nonNegativeLength else {
             return
         }
-        textViewController.selectionService.resetPreviouslySelectedRange()
         if selectedRange.length == 0 {
             selectedRange.location -= 1
             selectedRange.length = 1
@@ -704,11 +731,6 @@ public extension TextView {
         textViewController.moveToEndOfDocumentAndModifySelection()
     }
 
-    override func mouseDown(with event: NSEvent) {
-        let point = scrollContentView.convert(event.locationInWindow, from: nil)
-        textViewController.moveToLocation(closestTo: point)
-    }
-
     /// Copy the selected text.
     ///
     /// - Parameter sender: The object calling this method.
@@ -726,7 +748,6 @@ public extension TextView {
     @objc func paste(_ sender: Any?) {
         let selectedRange = selectedRange()
         if let string = NSPasteboard.general.string(forType: .string) {
-            print(string)
             let preparedText = textViewController.prepareTextForInsertion(string)
             textViewController.replaceText(in: selectedRange, with: preparedText)
         }
@@ -881,6 +902,15 @@ private extension TextView {
     }
 }
 
+// MARK: - Location
+private extension TextView {
+    private func locationClosestToPoint(in event: NSEvent) -> Int? {
+        let point = scrollContentView.convert(event.locationInWindow, from: nil)
+        let adjustedPoint = CGPoint(x: point.x - gutterWidth - textContainerInset.left, y: point.y)
+        return textViewController.layoutManager.closestIndex(to: adjustedPoint)
+    }
+}
+
 // MARK: - TextViewControllerDelegate
 extension TextView: TextViewControllerDelegate {
     func textViewControllerDidChangeText(_ textViewController: TextViewController) {