Remove unnecessary scan, improve docs

Mindera · Apr 5, 2021 · df87dac · df87dac
1 parent 0f7a36a
commit df87dac
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/Sources/Extensions/Foundation/String.swift b/Sources/Extensions/Foundation/String.swift
@@ -96,11 +96,6 @@ extension String {
             // exit early if we're already at the end
             guard !scanner.isAtEnd else { break }
 
-            // skip characters if needed
-            if let charactersToBeSkipped = charactersToBeSkipped {
-                scanner.scanCharacters(from: charactersToBeSkipped, into: nil)
-            }
-
             // find and replace matching character if needed
             replacementMap
                 .first { match, _ in scanner.scanString(String(match), into: nil) }
@@ -123,6 +118,8 @@ extension String {
     /// corresponding non line breaking variants when existent. Otherwise, word joiner characters are attached to them
     /// to make them non line breaking.
     ///
+    /// - Important: Any existing newline characters are preserved.
+    ///
     /// The character mapping is:
     ///  - space (" ") -> non breaking space (`U+2028`)
     ///  - hyphen ("-") -> non breaking hyphen (`U+00A0`)
@@ -141,7 +138,7 @@ extension String {
                 .emDash: String([.wordJoiner, .emDash, .wordJoiner]),
                 .enDash: String([.wordJoiner, .enDash, .wordJoiner]),
                 "?": "?" + .wordJoiner,
-                "}": "}" + .wordJoiner,
+                "}": "}" + .wordJoiner
             ],
             skippingCharactersIn: nil
         )

diff --git a/Tests/AlicerceTests/Extensions/Foundation/StringTestCase.swift b/Tests/AlicerceTests/Extensions/Foundation/StringTestCase.swift
@@ -156,7 +156,7 @@ class StringTestCase: XCTestCase {
 
         let original =
             """
-            \nThe quick-brown\u{85}\(String.emDash)fox\n\(String.enDash)jumps?\u{2028}\u{2029}over{the}lazy dog\n
+            \nThe quick-brown\u{85}\(String.emDash)fox\n\(String.enDash)jumps?\u{2028}\u{2029}over{the}lazy dog\n\
             \u{A}.\u{B},\u{C};\u{D}
             """
 
@@ -166,7 +166,7 @@ class StringTestCase: XCTestCase {
             \(String([.wordJoiner, .emDash, .wordJoiner]))fox\n\
             \(String([.wordJoiner, .enDash, .wordJoiner]))jumps\
             ?\(String.wordJoiner)\u{2028}\u{2029}over\
-            {the}\(String.wordJoiner)lazy\(String.nonBreakingSpace)dog\n
+            {the}\(String.wordJoiner)lazy\(String.nonBreakingSpace)dog\n\
             \u{A}.\u{B},\u{C};\u{D}
             """