YankingManager per instance

Author: krzyzanowskim

Sources/STTextViewMac/STTextView+Delete.swift

@@ -8,55 +8,55 @@ extension STTextView {
 
     open override func deleteForward(_ sender: Any?) {
         if let deletedString = delete(direction: .forward, destination: .character, allowsDecomposition: false) {
-            YankingManager.shared.kill(action: .delete, string: deletedString)
+            _yankingManager.kill(action: .delete, string: deletedString)
         }
     }
 
     open override func deleteBackward(_ sender: Any?) {
         if let deletedString = delete(direction: .backward, destination: .character, allowsDecomposition: false) {
-            YankingManager.shared.kill(action: .delete, string: deletedString)
+            _yankingManager.kill(action: .delete, string: deletedString)
         }
     }
 
     open override func deleteBackwardByDecomposingPreviousCharacter(_ sender: Any?) {
         if let deletedString = delete(direction: .backward, destination: .character, allowsDecomposition: true) {
-            YankingManager.shared.kill(action: .delete, string: deletedString)
+            _yankingManager.kill(action: .delete, string: deletedString)
         }
     }
 
     open override func deleteWordBackward(_ sender: Any?) {
         if let deletedString = delete(direction: .backward, destination: .word, allowsDecomposition: false) {
-            YankingManager.shared.kill(action: .deleteWordBackward, string: deletedString)
+            _yankingManager.kill(action: .deleteWordBackward, string: deletedString)
         }
     }
 
     open override func deleteWordForward(_ sender: Any?) {
         if let deletedString = delete(direction: .forward, destination: .word, allowsDecomposition: false) {
-            YankingManager.shared.kill(action: .deleteWordForward, string: deletedString)
+            _yankingManager.kill(action: .deleteWordForward, string: deletedString)
         }
     }
 
     open override func deleteToBeginningOfLine(_ sender: Any?) {
         if let deletedString = delete(direction: .backward, destination: .line, allowsDecomposition: false) {
-            YankingManager.shared.kill(action: .deleteToBeginningOfLine, string: deletedString)
+            _yankingManager.kill(action: .deleteToBeginningOfLine, string: deletedString)
         }
     }
 
     open override func deleteToEndOfLine(_ sender: Any?) {
         if let deletedString = delete(direction: .forward, destination: .line, allowsDecomposition: false) {
-            YankingManager.shared.kill(action: .deleteToEndOfLine, string: deletedString)
+            _yankingManager.kill(action: .deleteToEndOfLine, string: deletedString)
         }
     }
 
     open override func deleteToBeginningOfParagraph(_ sender: Any?) {
         if let deletedString = delete(direction: .backward, destination: .paragraph, allowsDecomposition: false) {
-            YankingManager.shared.kill(action: .deleteToBeginningOfLine, string: deletedString)
+            _yankingManager.kill(action: .deleteToBeginningOfLine, string: deletedString)
         }
     }
 
     open override func deleteToEndOfParagraph(_ sender: Any?) {
         if let deletedString = delete(direction: .forward, destination: .paragraph, allowsDecomposition: false) {
-            YankingManager.shared.kill(action: .deleteToEndOfParagraph, string: deletedString)
+            _yankingManager.kill(action: .deleteToEndOfParagraph, string: deletedString)
         }
     }
 

Sources/STTextViewMac/STTextView+Yank.swift

@@ -11,7 +11,7 @@ extension STTextView {
     open override func yank(_ sender: Any?) {
         replaceCharacters(
             in: textLayoutManager.insertionPointSelections.flatMap(\.textRanges),
-            with: YankingManager.shared.yank(),
+            with: _yankingManager.yank(),
             useTypingAttributes: true,
             allowsTypingCoalescing: false
         )

Sources/STTextViewMac/STTextView.swift

@@ -356,6 +356,7 @@ import AVFoundation
     /// `true` if the receiver allows undo, otherwise `false`. Default `true`.
     @objc dynamic open var allowsUndo: Bool
     internal var _undoManager: UndoManager?
+    internal var _yankingManager = YankingManager()
 
     internal class MarkedText: CustomDebugStringConvertible {
         var markedText: NSAttributedString
@@ -620,7 +621,7 @@ import AVFoundation
         NotificationCenter.default.addObserver(forName: STTextLayoutManager.didChangeSelectionNotification, object: textLayoutManager, queue: .main) { [weak self] notification in
             guard let self = self else { return }
 
-            YankingManager.shared.selectionChanged()
+            _yankingManager.selectionChanged()
 
             let textViewNotification = Notification(name: Self.didChangeSelectionNotification, object: self, userInfo: notification.userInfo)
 
@@ -1214,7 +1215,7 @@ import AVFoundation
         let notification = Notification(name: STTextView.textDidChangeNotification, object: self, userInfo: nil)
         NotificationCenter.default.post(notification)
         delegateProxy.textViewDidChangeText(notification)
-        YankingManager.shared.textChanged()
+        _yankingManager.textChanged()
 
         needsDisplay = true
     }

Sources/STTextViewMac/YankingManager.swift

@@ -7,8 +7,6 @@ import Foundation
 /// https://www.gnu.org/software/emacs/manual/html_node/emacs/Yanking.html
 final class YankingManager {
 
-    static let shared = YankingManager()
-
     enum DeleteAction {
         case delete
         case deleteToMark