Fancy Quotes and Apostrophes are not matched to Scroll To Text Fragme…

…nt fragments. https://bugs.webkit.org/show_bug.cgi?id=244918 Reviewed by Wenson Hsieh. Leverage existing quote folding code to match non-ascii quote marks for more accurate fragment matching. * LayoutTests/http/tests/scroll-to-text-fragment/start-text-quote-expected.html: Added. * LayoutTests/http/tests/scroll-to-text-fragment/start-text-quote.html: Added. * Source/WebCore/dom/FragmentDirectiveRangeFinder.cpp: (WebCore::FragmentDirectiveRangeFinder::findRangeFromNodeList): Canonical link: https://commits.webkit.org/254275@main
WebKit · Sep 8, 2022 · c79c0dc354f2430992eebd89c515da6bc39406ea · darinadler · Sep 8, 2022 · c79c0dc
1 parent 768cdfe
commit c79c0dc354f2430992eebd89c515da6bc39406ea
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git a/LayoutTests/http/tests/scroll-to-text-fragment/start-text-quote-expected.html b/LayoutTests/http/tests/scroll-to-text-fragment/start-text-quote-expected.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta charset="utf-8" />
+<title>Scroll to text fragment - highlight simple start reference</title>
+<style>
+  span {
+    background-color: rgb(255, 238, 190);
+  }
+</style>
+
+<p>The test passes if the following word has a yellow background.</p>
+<div>Select <span>“isn’t”</span> to pass.</div>
diff --git a/LayoutTests/http/tests/scroll-to-text-fragment/start-text-quote.html b/LayoutTests/http/tests/scroll-to-text-fragment/start-text-quote.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html><!-- webkit-test-runner [ ScrollToTextFragmentIndicatorEnabled=false ] -->
+<meta charset="utf-8" />
+<title>Scroll to text fragment - highlight simple start text</title>
+<link rel="help" href="https://wicg.github.io/scroll-to-text-fragment/">
+<meta name="assert" content="This test checks that a fragment directive with quotes and apostrophes is correctly highlighted.">
+
+<p>The test passes if the following word has a yellow background.</p>
+<div>Select <span>“isn’t”</span> to pass.</div>
+
+<script>
+  location.href = "#:~:text=\"isn't\"";
+</script>
+</html>
diff --git a/Source/WebCore/dom/FragmentDirectiveRangeFinder.cpp b/Source/WebCore/dom/FragmentDirectiveRangeFinder.cpp
@@ -145,6 +145,8 @@ static std::optional<SimpleRange> findRangeFromNodeList(const String& query, con
     // FIXME: try to use SearchBuffer in TextIterator.h instead.
     searchBuffer = searchBufferBuilder.toString();
 
+    searchBuffer = foldQuoteMarks(searchBuffer);
+
     unsigned searchStart = 0;
 
     if (nodes[0].ptr() == &searchRange.startContainer())