Merge pull request #1 from badoo/switched_to_compiler_check

Fix range calculation

Author: wiruzx

HyperLabel/HyperLabelTextStyler.swift

@@ -30,7 +30,8 @@ public struct HyperLabelTextStyler {
                                     at range: Range<String.Index>) -> NSAttributedString {
         guard !self.linkAttributes.isEmpty else { return attributedString }
         let mutable = attributedString.mutableCopy() as! NSMutableAttributedString
-        let text = mutable.string
+        // https://bugs.swift.org/browse/SR-11330
+        let text = mutable.string + ""
         let range = NSRange(range, in: text)
         mutable.addAttributes(self.linkAttributes, range: range)
         return mutable.copy() as! NSAttributedString

HyperLabel/TextLayoutInfoProvider.swift

@@ -58,7 +58,7 @@ final class TextLayoutInfoProvider {
         let usedRect = self.layoutManager.usedRect(for: self.textContainer)
         guard usedRect.contains(point) else { return nil }
         let index = self.layoutManager.glyphIndex(for: point, in: self.textContainer)
-        #if swift(>=5)
+        #if compiler(>=5)
         return String.Index(utf16Offset: index,
                             in: self.textStorage.string)
         #else

HyperLabelTests/HyperLabelTests.swift

@@ -26,24 +26,45 @@ import XCTest
 
 class HyperLabelTests: XCTestCase {
 
-    override func setUp() {
-        // Put setup code here. This method is called before the invocation of each test method in the class.
-    }
+    override func setUp() { }
 
-    override func tearDown() {
-        // Put teardown code here. This method is called after the invocation of each test method in the class.
-    }
+    override func tearDown() { }
+
+    func test_GivenTextWithSpecialCharacter_WhenAddLink_ThenRangesAreCorrect() {
+        // Given
+        // '’' is UTF16?
+        let exampleText = "You’ll be happy one day."
+        let sut: HyperLabel = {
+            let hyperLabel = HyperLabel()
+            hyperLabel.numberOfLines = 0
+            hyperLabel.text = exampleText
+            hyperLabel.additionalLinkAttributes = [.underlineStyle: NSUnderlineStyle.single.rawValue]
+            return hyperLabel
+        }()
 
-    func testExample() {
-        // This is an example of a functional test case.
-        // Use XCTAssert and related functions to verify your tests produce the correct results.
+        // When
+        let range = exampleText.range(of: "day")!
+
+        // Then
+        sut.addLink(withRange: range) {}
     }
 
-    func testPerformanceExample() {
-        // This is an example of a performance test case.
-        self.measure {
-            // Put the code you want to measure the time of here.
-        }
+    func test_GivenSimpleText_WhenAddLink_ThenRangesAreCorrect() {
+        // Given
+        let exampleText = "Look's good with no special characters."
+        let sut: HyperLabel = {
+            let hyperLabel = HyperLabel()
+            hyperLabel.numberOfLines = 0
+            hyperLabel.text = exampleText
+            hyperLabel.additionalLinkAttributes = [.underlineStyle: NSUnderlineStyle.single.rawValue]
+            return hyperLabel
+        }()
+
+        // When
+        let range = exampleText.range(of: "characters")!
+
+        // Then
+        sut.addLink(withRange: range) {}
     }
 
 }