Add own insertion indicator while rectangular selection

coteditor · Aug 16, 2023 · d3594cb · d3594cb
1 parent 2abd792
commit d3594cb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CotEditor/Sources/EditorTextView.swift b/CotEditor/Sources/EditorTextView.swift
@@ -444,6 +444,7 @@ class EditorTextView: NSTextView, Themable, CurrentLineHighlighting, MultiCursor
 
         self.mouseDownPoint = self.convert(event.locationInWindow, from: nil)
         self.isPerformingRectangularSelection = event.modifierFlags.contains(.option)
+        self.needsUpdateInsertionIndicators = true  // to draw dummy indicator for proper one while selecting
         self.updateInsertionPointTimer()
 
         let selectedRange = self.selectedRange.isEmpty ? self.selectedRange : nil

diff --git a/CotEditor/Sources/NSTextView+MultiCursor.swift b/CotEditor/Sources/NSTextView+MultiCursor.swift
@@ -412,11 +412,14 @@ extension MultiCursorEditing {
 
         guard !self.insertionLocations.isEmpty || !self.insertionIndicators.isEmpty else { return }
 
+        let properInsertionLocations = (self.isPerformingRectangularSelection && self.selectedRange.isEmpty) ? [self.selectedRange.location] : []
+        let insertionLocations = (self.insertionLocations + properInsertionLocations)
+
         // reuse existing indicators
         var indicators = ArraySlice(self.insertionIndicators)  // slice for popFirst()
         let isActive = (self.window?.firstResponder == self && NSApp.isActive)
 
-        self.insertionIndicators = self.insertionLocations
+        self.insertionIndicators = insertionLocations
             .compactMap { self.insertionPointRects(at: $0).first }  // ignore split cursors
             .map { rect in
                 if let indicator = indicators.popFirst() {