From 59f63f3d9671c6e77a628f85e5168ec89e48082a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Menu?= <mickael.menu@gmail.com>
Date: Tue, 4 Jun 2024 14:02:53 +0200
Subject: [PATCH] Fix resolving search results title

---
 CHANGELOG.md                                    |  4 ++++
 Sources/Internal/Extensions/String.swift        |  2 +-
 .../InternalTests/Extensions/StringTests.swift  | 17 +++++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 Tests/InternalTests/Extensions/StringTests.swift

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb1fee387..f282a3b29 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,10 @@ All notable changes to this project will be documented in this file. Take a look
 
 ### Fixed
 
+#### Shared
+
+* [#444](https://github.com/readium/swift-toolkit/issues/444) Fixed resolving titles of search results when the table of contents items contain fragment identifiers.
+
 #### Navigator
 
 * Optimized scrolling to an EPUB text-based locator if it contains a CSS selector.
diff --git a/Sources/Internal/Extensions/String.swift b/Sources/Internal/Extensions/String.swift
index 38eca64a2..910d44c41 100644
--- a/Sources/Internal/Extensions/String.swift
+++ b/Sources/Internal/Extensions/String.swift
@@ -67,7 +67,7 @@ public extension String {
         guard let range = range(of: delimiter, options: [.backwards, .literal]) else {
             return self
         }
-        return String(self[...range.lowerBound])
+        return String(self[..<range.lowerBound])
     }
 
     /// Replaces multiple whitespaces by a single space.
diff --git a/Tests/InternalTests/Extensions/StringTests.swift b/Tests/InternalTests/Extensions/StringTests.swift
new file mode 100644
index 000000000..15e68b15c
--- /dev/null
+++ b/Tests/InternalTests/Extensions/StringTests.swift
@@ -0,0 +1,17 @@
+//
+//  Copyright 2024 Readium Foundation. All rights reserved.
+//  Use of this source code is governed by the BSD-style license
+//  available in the top-level LICENSE file of the project.
+//
+
+import Foundation
+@testable import ReadiumInternal
+import XCTest
+
+class StringTests: XCTestCase {
+    func testSubstringBeforeLast() {
+        XCTAssertEqual("href".substringBeforeLast("#"), "href")
+        XCTAssertEqual("href#anchor".substringBeforeLast("#"), "href")
+        XCTAssertEqual("href#anchor#test".substringBeforeLast("#"), "href#anchor")
+    }
+}