From 27f2f36af4b318a3d0ce0226d0690989d7d601c3 Mon Sep 17 00:00:00 2001
From: Andrej Mihajlov <and.mikhaylov@gmail.com>
Date: Sun, 22 Oct 2023 13:33:01 +0200
Subject: [PATCH] Clean up the code around STInsertionPointProtocol (#41)

This PR removes unnecessary availability checks and downcast to the
concrete implementation of `STInsertionPointProtocol` by moving the
`color` property into `STInsertionPointProtocol` and accessing it
directly over the type-erased `textInsertionIndicator:
STInsertionPointProtocol`.

Since Apple declare the `NSTextInsertionIndicator.color` as `NSColor!`,
it's impossible to reuse the same name for property as `NSColor` and
`NSColor!` are different in the eyes of compiler, therefore the `color`
had to be declared as `insertionPointColor` within the
`STInsertionPointProtocol` protocol to workaround that.
---
 Sources/STTextView/STInsertionPointView.swift | 45 +++++++++----------
 1 file changed, 20 insertions(+), 25 deletions(-)

diff --git a/Sources/STTextView/STInsertionPointView.swift b/Sources/STTextView/STInsertionPointView.swift
index a59f252..4fb519f 100644
--- a/Sources/STTextView/STInsertionPointView.swift
+++ b/Sources/STTextView/STInsertionPointView.swift
@@ -13,21 +13,11 @@ open class STInsertionPointView: NSView {
 
     var insertionPointColor: NSColor {
         get {
-            if #available(macOS 14, *), let textInsertionIndicator = textInsertionIndicator as? STTextInsertionIndicatorNew {
-                return textInsertionIndicator.color
-            } else if let textInsertionIndicator = textInsertionIndicator as? STTextInsertionIndicatorOld {
-                return textInsertionIndicator.color
-            }
-
-            return .clear
+            textInsertionIndicator.insertionPointColor
         }
 
         set {
-            if #available(macOS 14, *), let textInsertionIndicator = textInsertionIndicator as? STTextInsertionIndicatorNew {
-                textInsertionIndicator.color = newValue
-            } else if let textInsertionIndicator = textInsertionIndicator as? STTextInsertionIndicatorOld {
-                textInsertionIndicator.color = newValue
-            }
+            textInsertionIndicator.insertionPointColor = newValue
         }
     }
 
@@ -48,24 +38,18 @@ open class STInsertionPointView: NSView {
     }
 
     func blinkStart() {
-        if #available(macOS 14, *), let textInsertionIndicator = textInsertionIndicator as? STTextInsertionIndicatorNew {
-            textInsertionIndicator.blinkStart()
-        } else if let textInsertionIndicator = textInsertionIndicator as? STTextInsertionIndicatorOld {
-            textInsertionIndicator.blinkStart()
-        }
+        textInsertionIndicator.blinkStart()
     }
 
     func blinkStop() {
-        if #available(macOS 14, *), let textInsertionIndicator = textInsertionIndicator as? STTextInsertionIndicatorNew {
-            textInsertionIndicator.blinkStop()
-        } else if let textInsertionIndicator = textInsertionIndicator as? STTextInsertionIndicatorOld {
-            textInsertionIndicator.blinkStop()
-        }
+        textInsertionIndicator.blinkStop()
     }
 
 }
 
 private protocol STInsertionPointProtocol: NSView {
+    var insertionPointColor: NSColor { get set }
+
     func blinkStart()
     func blinkStop()
 }
@@ -82,6 +66,16 @@ private class STTextInsertionIndicatorNew: NSTextInsertionIndicator, STInsertion
         fatalError("init(coder:) has not been implemented")
     }
 
+    var insertionPointColor: NSColor {
+        get {
+            color
+        }
+
+        set {
+            color = newValue
+        }
+    }
+
     func blinkStart() {
         displayMode = .automatic
     }
@@ -97,9 +91,10 @@ private class STTextInsertionIndicatorNew: NSTextInsertionIndicator, STInsertion
 
 private class STTextInsertionIndicatorOld: NSView, STInsertionPointProtocol {
     private var timer: Timer?
-    var color: NSColor = .defaultTextInsertionPoint {
+
+    var insertionPointColor: NSColor = .defaultTextInsertionPoint {
         didSet {
-            layer?.backgroundColor = color.cgColor
+            layer?.backgroundColor = insertionPointColor.cgColor
         }
     }
 
@@ -109,7 +104,7 @@ private class STTextInsertionIndicatorOld: NSView, STInsertionPointProtocol {
         super.init(frame: indicatorRect)
 
         wantsLayer = true
-        layer?.backgroundColor = color.withAlphaComponent(0.9).cgColor
+        layer?.backgroundColor = insertionPointColor.withAlphaComponent(0.9).cgColor
         layer?.cornerRadius = 1
     }