Merge pull request #255 from ABridoux/bugfix/253-jaro-winkler-single-…

…character Fixed Jaro-Winkler crash when comparing two single characters
ABridoux · Jun 6, 2021 · d122e68 · d122e68
2 parents 05ae72b + 0dcb48a
commit d122e68
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Sources/Scout/Extensions/String+Jaro-Winkler.swift b/Sources/Scout/Extensions/String+Jaro-Winkler.swift
@@ -38,7 +38,7 @@ private struct JaroWinklerDistance {
         self.string1 = string1
         self.string2 = string2
 
-        maxSpacing = max(string1.count, string2.count) / 2 - 1
+        maxSpacing = max(0, max(string1.count, string2.count) / 2 - 1)
     }
 
     func computeMatches() -> [Int] {

diff --git a/Tests/ScoutTests/ExtensionsTests/String+Jaro-WinklerTests.swift b/Tests/ScoutTests/ExtensionsTests/String+Jaro-WinklerTests.swift
@@ -33,4 +33,9 @@ final class String_JaroWinklerTests: XCTestCase {
         let result = target.bestJaroWinklerMatchIn(propositions: propositions)
         XCTAssertEqual(result, "version")
     }
+
+    func testMatchSingleCharacters_Equals0() {
+        let result = "b".jaroWinklerDistance(from: "a")
+        XCTAssertEqual(result, 0)
+    }
 }