Changeset 72989 in webkit

Timestamp:

Nov 30, 2010, 5:48:07 PM (14 years ago)

Author:

mitz@apple.com

Message:

Text search should treat all matches as word-start matches when the target begins with a separator character
​https://bugs.webkit.org/show_bug.cgi?id=50302

Reviewed by Darin Adler.

WebCore:

• editing/TextIterator.cpp:

(WebCore::SearchBuffer::SearchBuffer): Disable the AtWordStarts option if it was specified and
the target string begins with one of the "separator" characters.

LayoutTests:

• editing/text-iterator/findString.html:
• editing/text-iterator/findString-expected.txt:
• platform/mac-leopard/editing/text-iterator: Removed.
• platform/mac-leopard/editing/text-iterator/findString-expected.txt: Removed.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/text-iterator/findString-expected.txt (modified) (2 diffs)
• LayoutTests/editing/text-iterator/findString.html (modified) (2 diffs)
• LayoutTests/platform/mac-leopard/editing/text-iterator (deleted)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/TextIterator.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-11-30  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Text search should treat all matches as word-start matches when the target begins with a separator character
+        https://bugs.webkit.org/show_bug.cgi?id=50302
+
+        * editing/text-iterator/findString.html:
+        * editing/text-iterator/findString-expected.txt:
+        * platform/mac-leopard/editing/text-iterator: Removed.
+        * platform/mac-leopard/editing/text-iterator/findString-expected.txt: Removed.
+
 2010-11-30  Martin Robinson  <mrobinson@igalia.com>
 

trunk/LayoutTests/editing/text-iterator/findString-expected.txt

@@ -53 +53 @@
 
 Searching for ‘.org’ in ‘webkit.org’ with options [AtWordStarts]:
+PASS: Got a match at 6,10 as expected.
 PASS: Got no match as expected.
 
@@ -147 +148 @@
 PASS: Got no match as expected.
 
+Searching for ‘ ’ in ‘Spaces, the final frontier’ with options [AtWordStarts]:
+PASS: Got a match at 7,8 as expected.
+PASS: Got a match at 11,12 as expected.
+PASS: Got a match at 17,18 as expected.
+PASS: Got no match as expected.
 
+Searching for ‘@’ in ‘Use an @import rule’ with options [AtWordStarts]:
+PASS: Got a match at 7,8 as expected.
+PASS: Got no match as expected.
+
+Searching for ‘(x’ in ‘If ((x + 5) * 2) = 14, then x = 2’ with options [AtWordStarts]:
+PASS: Got a match at 4,6 as expected.
+PASS: Got no match as expected.
+
+

trunk/LayoutTests/editing/text-iterator/findString.html

@@ -52 +52 @@
 
     testFindString("webkit.org", "org", ["AtWordStarts"], [[]]);
-    testFindString("webkit.org", ".org", ["AtWordStarts"], [[]]);
+    testFindString("webkit.org", ".org", ["AtWordStarts"], [[6, 10], []]);
 
     testFindString("webkit.org", "rg", ["AtWordStarts", "TreatMedialCapitalAsWordStart"], [[]]);
@@ -102 +102 @@
     testFindString(bufferSizedString.substring(0, searchBufferUnoverlappedSize - 3) + " " + thaiWords[4] + bufferSizedString, thaiWords[2], ["AtWordStarts"], [[]]);
 
+    testFindString("Spaces, the final frontier", " ", ["AtWordStarts"], [[7, 8], [11, 12], [17, 18], []]);
+    testFindString("Use an @import rule", "@", ["AtWordStarts"], [[7, 8], []]);
+    testFindString("If ((x + 5) * 2) = 14, then x = 2", "(x", ["AtWordStarts"], [[4, 6], []]);
+
     document.getElementById("console").style.removeProperty("visibility");
 </script>

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-11-30  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Text search should treat all matches as word-start matches when the target begins with a separator character
+        https://bugs.webkit.org/show_bug.cgi?id=50302
+
+        * editing/TextIterator.cpp:
+        (WebCore::SearchBuffer::SearchBuffer): Disable the AtWordStarts option if it was specified and
+        the target string begins with one of the "separator" characters.
+
 2010-11-30  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/WebCore/editing/TextIterator.cpp

@@ -1893 +1893 @@
     m_overlap = m_buffer.capacity() / 4;
 
+    if ((m_options & AtWordStarts) && targetLength) {
+        UChar32 targetFirstCharacter;
+        U16_GET(m_target.characters(), 0, 0, targetLength, targetFirstCharacter);
+        // Characters in the separator category never really occur at the beginning of a word,
+        // so if the target begins with such a character, we just ignore the AtWordStart option.
+        if (isSeparator(targetFirstCharacter)) {
+            m_options &= ~AtWordStarts;
+            m_needsMoreContext = false;
+        }
+    }
+
     // Grab the single global searcher.
     // If we ever have a reason to do more than once search buffer at once, we'll have