Fix occasional crash when typing ñ into search box (#391)

Author: nighthawk

Sources/TripKit/search/TKAutocompletionResult+Score.swift

@@ -81,8 +81,16 @@ extension TKAutocompletionResult {
       return 100 // having typed yet means a perfect match of everything you've typed so far
     }
 
+    
+    func nsRange(of string: String) -> NSRange? {
+      let haystack = fullCandidate.lowercased()
+      let needle = string.lowercased()
+      let range = (haystack as NSString).range(of: needle)
+      return  range.location == NSNotFound ? nil : range
+    }
+    
     if target == candidate {
-      return .init(score: 100, ranges: [.init(location: 0, length: candidate.utf8.count)])
+      return .init(score: 100, ranges: [nsRange(of: candidate)].compactMap { $0 })
     }
 
     if target.isAbbreviation(for: candidate) || target.isAbbreviation(for: stringForScoring(fullCandidate, removeBrackets: true)) {
@@ -92,13 +100,7 @@ extension TKAutocompletionResult {
     if candidate.isAbbreviation(for: target) || candidate.isAbbreviation(for: stringForScoring(fullTarget, removeBrackets: true)) {
       return 90
     }
-    
-    func nsRange(of string: String) -> NSRange? {
-      let haystack = fullCandidate.lowercased()
-      let needle = string.lowercased()
-      let range = (haystack as NSString).range(of: needle)
-      return  range.location == NSNotFound ? nil : range
-    }
+
 
     // exact phrase matches
     let excess = candidate.utf8.count - target.utf8.count

Sources/TripKit/search/TKAutocompletionResult.swift

@@ -28,11 +28,19 @@ public struct TKAutocompletionResult {
 
   public let title: String
 
-  public var titleHighlightRanges: [NSRange] = []
+  public var titleHighlightRanges: [NSRange] = [] {
+    didSet {
+      assert(titleHighlightRanges.allSatisfy({ title.count >= $0.upperBound }))
+    }
+  }
 
   public var subtitle: String? = nil
 
-  public var subtitleHighlightRanges: [NSRange] = []
+  public var subtitleHighlightRanges: [NSRange] = [] {
+    didSet {
+      assert(titleHighlightRanges.allSatisfy({ (subtitle ?? "").count >= $0.upperBound }))
+    }
+  }
 
   public let image: TKImage
 

Sources/TripKit/search/TKGeocodingResultScorer.swift

@@ -11,12 +11,9 @@
 import Foundation
 import MapKit
 
-public class TKGeocodingResultScorer: NSObject {
+enum TKGeocodingResultScorer {
 
-  private override init() {
-  }
-  
-  public static func calculateScore(for annotation: MKAnnotation, searchTerm: String, near region: MKCoordinateRegion, allowLongDistance: Bool, minimum: Int, maximum: Int) -> TKAutocompletionResult.ScoreHighlights {
+  static func calculateScore(for annotation: MKAnnotation, searchTerm: String, near region: MKCoordinateRegion, allowLongDistance: Bool, minimum: Int, maximum: Int) -> TKAutocompletionResult.ScoreHighlights {
 
     guard let title = (annotation.title ?? nil) else {
       return .init(score: 0)
@@ -42,7 +39,7 @@ public class TKGeocodingResultScorer: NSObject {
     )
   }
 
-  public static func calculateScore(title: String, subtitle: String?, searchTerm: String, minimum: Int, maximum: Int) -> TKAutocompletionResult.ScoreHighlights {
+  static func calculateScore(title: String, subtitle: String?, searchTerm: String, minimum: Int, maximum: Int) -> TKAutocompletionResult.ScoreHighlights {
     assert(maximum > minimum, "Order must be preserved.")
 
     let titleScore = TKAutocompletionResult.nameScore(searchTerm: searchTerm, candidate: title)

Tests/TripKitTests/searching/TKAutocompletionHighlightTest.swift

@@ -0,0 +1,31 @@
+//
+//  TKAutocompletionHighlightTest.swift
+//  TripKitTests
+//
+//  Created by Adrian Schönig on 7/3/2025.
+//  Copyright © 2025 SkedGo Pty Ltd. All rights reserved.
+//
+
+#if canImport(Testing)
+
+import Testing
+
+@testable import TripKit
+
+struct TKAutocompletionHighlightTest {
+  
+  @Test func spanishHighlights() async throws {
+    
+    let highlights = TKAutocompletionResult.nameScore(
+      searchTerm: "Hotel España",
+      candidate: "Hotel españa"
+    )
+    
+    #expect(highlights.ranges.count == 1)
+    #expect(highlights.ranges.first?.location == 0)
+    #expect(highlights.ranges.first?.length == 12)
+  }
+  
+}
+
+#endif

TripKit.xcodeproj/project.pbxproj

@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		3A0F254C27F5397100DEB6A0 /* NSManagedObject+Safely.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A0F254B27F5397100DEB6A0 /* NSManagedObject+Safely.swift */; };
+		3A10C71A2D7AA1A10079C015 /* TKAutocompletionHighlightTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A10C7192D7AA1A10079C015 /* TKAutocompletionHighlightTest.swift */; };
 		3A1777AC232C17560093D495 /* TripKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AB6C6201D1CD0060089F687 /* TripKit.framework */; };
 		3A1777AD232C17560093D495 /* TripKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3AB6C6201D1CD0060089F687 /* TripKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		3A1777AF232C17570093D495 /* TripKitInterApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6DF167202C97F60084CB2C /* TripKitInterApp.framework */; };
@@ -767,6 +768,7 @@
 
 /* Begin PBXFileReference section */
 		3A0F254B27F5397100DEB6A0 /* NSManagedObject+Safely.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSManagedObject+Safely.swift"; sourceTree = "<group>"; };
+		3A10C7192D7AA1A10079C015 /* TKAutocompletionHighlightTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TKAutocompletionHighlightTest.swift; sourceTree = "<group>"; };
 		3A19BE2427ABA44500B4AA8C /* TKUITripTitleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TKUITripTitleView.swift; sourceTree = "<group>"; };
 		3A19BE2627ABA44D00B4AA8C /* TKUITripTitleView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TKUITripTitleView.xib; sourceTree = "<group>"; };
 		3A1AABAA26CB6F8000FDDB06 /* TKAutocompletionResult+Icon.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "TKAutocompletionResult+Icon.swift"; sourceTree = "<group>"; };
@@ -2683,6 +2685,7 @@
 			isa = PBXGroup;
 			children = (
 				3AFF2A1D26C69A96007809CD /* TKAnnotationClusterer.swift */,
+				3A10C7192D7AA1A10079C015 /* TKAutocompletionHighlightTest.swift */,
 				3AD653EF28FF544F00A846C5 /* TKAutocompletionResultTest.swift */,
 				3AFF2A1C26C69A96007809CD /* TKGeoJSONTest.swift */,
 				3AFF2A1B26C69A96007809CD /* TKPeliasTitleTest.swift */,
@@ -3630,6 +3633,7 @@
 				3ACD91E826CCC47B0075CCF3 /* TKUIPolylineRendererStabilityTest.swift in Sources */,
 				3ACD920026CCC47B0075CCF3 /* ObservableConvertibleType+Blocking.swift in Sources */,
 				3ACD91FF26CCC47B0075CCF3 /* BlockingObservable.swift in Sources */,
+				3A10C71A2D7AA1A10079C015 /* TKAutocompletionHighlightTest.swift in Sources */,
 				3ACD91EF26CCC47B0075CCF3 /* Event+Equatable.swift in Sources */,
 				3ACD91ED26CCC47B0075CCF3 /* Any+Equatable.swift in Sources */,
 				3AFF2AA426C69A96007809CD /* TKBuzzInfoProviderTest.swift in Sources */,