Bug 634153 - Back out the changes in bug 355178 because of known regressions and possible risk of not-yet-known regressions; r=sicking a=johnath

--HG-- extra : rebase_source : 4d77b7503991a3399cd6eecbcffb994b16fed43c
2024-11-26 06:11:37 +00:00 · 2011-02-15 17:04:44 -05:00 · 2011-02-15 17:04:44 -05:00 · a61c5e796e
commit a61c5e796e
parent f33e409c72
8 changed files with 47 additions and 64 deletions
--- a/extensions/spellcheck/locales/en-US/hunspell/dictionary-sources/upstream-hunspell.diff
+++ b/extensions/spellcheck/locales/en-US/hunspell/dictionary-sources/upstream-hunspell.diff
@ -9463,103 +9463,101 @@
 < schrod's
 ---
 > schrod/SM
-41998a42010
-> scot-free
-42883,42885c48695
+42883,42885c48694
 < shit's
 < shit/S!
 < shite/S!
 ---
 > shit/MS!
-42887,42888c48697,48698
+42887,42888c48696,48697
 < shithead/S!
 < shitload/!
 ---
 > shithead/MS!
 > shitload/MS!
-42891c48701
+42891c48700
 < shitty/RT!
 ---
 > shitty/TR!
-42976a48787
+42976a48786
 > should've
-43008c48819
+43008c48818
 < showtime
 ---
 > showtime/MS
-43724,43726c49535
+43724,43726c49534
 < smoulder's
 < smouldered
 < smoulders
 ---
 > smoulder/GSMD
-44062c49871
+44062c49870
 < sonofabitch
 ---
 > sonofabitch/!
-44371a50181
+44371a50180
 > spick/S!
-44383c50193
+44383c50192
 < spik/S
 ---
 > spik/S!
-46106a51917
+46106a51916
 > syllabi
-46160c51971
+46160c51970
 < synch/GMD
 ---
 > synch/GMDS
-46167d51977
+46167d51976
 < synchs
-46203,46204c52013,52014
+46203,46204c52012,52013
 < sysadmin/S
 < sysop/S
 ---
 > sysadmin/MS
 > sysop/MS
-46752a52563
+46752a52562
 > terabit/MS
-46753a52565,52566
+46753a52564,52565
 > terahertz/M
 > terapixel/MS
-46817a52631
+46817a52630
 > testcase/MS
-46831a52646
+46831a52645
 > testsuite/MS
-46925a52741
+46925a52740
 > theremin/MS
-47755a53572
+47755a53571
 > transfect/DSMG
-47774a53592,53593
+47774a53591,53592
 > transgenderism
 > transgene/MS
-47951c53770
+47951c53769
 < triage/M
 ---
 > triage/MG
-48869a54689
+48869a54688
 > unlikeable
-49211c55031
+49211c55030
 < vagina/M
 ---
 > vagina/MS
-49368,49369c55188
+49368,49369c55187
 < velour's
 < velours's
 ---
 > velour/MS
-49478a55298
+49478a55297
 > vertices
-50148a55969
+50148a55968
 > weaponize/DSG
-50260,50261d56080
+50260,50261d56079
 < werwolf/M
 < werwolves
-50728c56547
+50728c56546
 < women
 ---
 > women/M
-50794c56613
+50794c56612
 < wop/S!
 ---
 > wop/MS!
--- a/extensions/spellcheck/locales/en-US/hunspell/en-US.dic
+++ b/extensions/spellcheck/locales/en-US/hunspell/en-US.dic
@ -1,4 +1,4 @@
-57435
+57434
 0/nm
 0th/pt
 1/n1
@ -48141,7 +48141,6 @@ scorn/MDRSZG
 scorner/M
 scornful/Y
 scorpion/MS
-scot-free
 scotch/MDSG
 scotchs
 scoundrel/MS
--- a/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp
+++ b/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp
@ -899,36 +899,12 @@ WordSplitState::ClassifyCharacter(PRInt32 aIndex, PRBool aRecurse) const
    return CHAR_CLASS_WORD;
  }

-  // The dot character, if appearing at the end of a word, should
-  // be considered part of that word.  Example: "etc.", or
-  // abbreviations
-  if (aIndex > 0 &&
-      mDOMWordText[aIndex] == '.' &&
-      mDOMWordText[aIndex - 1] != '.' &&
-      ClassifyCharacter(aIndex - 1, false) != CHAR_CLASS_WORD) {
-    return CHAR_CLASS_WORD;
-  }
-
  // all other punctuation
  if (charCategory == nsIUGenCategory::kSeparator ||
      charCategory == nsIUGenCategory::kOther ||
      charCategory == nsIUGenCategory::kPunctuation ||
-      charCategory == nsIUGenCategory::kSymbol) {
-    // Don't break on hyphens, as hunspell handles them on its own.
-    if (aIndex > 0 &&
-        mDOMWordText[aIndex] == '-' &&
-        mDOMWordText[aIndex - 1] != '-' &&
-        ClassifyCharacter(aIndex - 1, false) == CHAR_CLASS_WORD) {
-      // A hyphen is only meaningful as a separator inside a word
-      // if the previous and next characters are a word character.
-      if (aIndex == PRInt32(mDOMWordText.Length()) - 1)
-        return CHAR_CLASS_SEPARATOR;
-      if (mDOMWordText[aIndex + 1] != '.' &&
-          ClassifyCharacter(aIndex + 1, false) == CHAR_CLASS_WORD)
-        return CHAR_CLASS_WORD;
-    }
+      charCategory == nsIUGenCategory::kSymbol)
    return CHAR_CLASS_SEPARATOR;
-  }

  // any other character counts as a word
  return CHAR_CLASS_WORD;
--- a/extensions/spellcheck/src/mozSpellChecker.cpp
+++ b/extensions/spellcheck/src/mozSpellChecker.cpp
@ -41,9 +41,7 @@
 #include "nsICategoryManager.h"
 #include "nsISupportsPrimitives.h"

-// The number 130 more or less comes out of thin air.
-// See https://bugzilla.mozilla.org/show_bug.cgi?id=355178#c78 for a pseudo-rationale.
-#define UNREASONABLE_WORD_LENGTH 130
+#define UNREASONABLE_WORD_LENGTH 64

 #define DEFAULT_SPELL_CHECKER "@mozilla.org/spellchecker/engine;1"

--- a/layout/reftests/editor/reftest.list
+++ b/layout/reftests/editor/reftest.list
@ -47,7 +47,7 @@ needs-focus == input-text-notheme-onfocus-reframe.html input-text-notheme-onfocu
 needs-focus == caret_after_reframe.html caret_after_reframe-ref.html
 == nobogusnode-1.html nobogusnode-ref.html
 == nobogusnode-2.html nobogusnode-ref.html
-== spellcheck-hyphen-valid.html spellcheck-hyphen-valid-ref.html
+fails == spellcheck-hyphen-valid.html spellcheck-hyphen-valid-ref.html
 != spellcheck-hyphen-invalid.html spellcheck-hyphen-invalid-ref.html
 == spellcheck-slash-valid.html spellcheck-slash-valid-ref.html
 == spellcheck-period-valid.html spellcheck-period-valid-ref.html
@ -55,4 +55,5 @@ needs-focus == caret_after_reframe.html caret_after_reframe-ref.html
 == spellcheck-comma-valid.html spellcheck-comma-valid-ref.html
 == spellcheck-hyphen-multiple-valid.html spellcheck-hyphen-multiple-valid-ref.html
 != spellcheck-hyphen-multiple-invalid.html spellcheck-hyphen-multiple-invalid-ref.html
+== spellcheck-dotafterquote-valid.html spellcheck-dotafterquote-valid-ref.html
 == unneeded_scroll.html unneeded_scroll-ref.html
--- a/layout/reftests/editor/spellcheck-dotafterquote-valid-ref.html
+++ b/layout/reftests/editor/spellcheck-dotafterquote-valid-ref.html
@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<html>
+  <body>
+    <textarea autofocus spellcheck="false">'Apple'.</textarea>
+  </body>
+</html>
--- a/layout/reftests/editor/spellcheck-dotafterquote-valid.html
+++ b/layout/reftests/editor/spellcheck-dotafterquote-valid.html
@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<html>
+  <body>
+    <textarea autofocus>'Apple'.</textarea>
+  </body>
+</html>
--- a/layout/reftests/text/wordwrap-02.html
+++ b/layout/reftests/text/wordwrap-02.html
@ -17,7 +17,6 @@ textarea {
  <title>Test Wordwrap</title>
 </head>
 <body>
-  <!-- spellcheck="false" added as a workaround to our maximum length of words for the spell checker -->
-  <textarea spellcheck="false" rows="10" cols="20" dir="rtl">ذهعقروبلجيكا،الموسوعةكل,تمبوابةاقتصاديةهذه.ضمنهاالروسوحرمانبلعدد,يكنجسيمةلإعادةلم.يكنوالحلفاءبالقنابلهو,بحثخسائرالدفاعبالهجومعن.فرنسيةمارشالبينيتودحرثم,وصلبشريةالرايخبالحربتم.</textarea>
+  <textarea rows="10" cols="20" dir="rtl">ذهعقروبلجيكا،الموسوعةكل,تمبوابةاقتصاديةهذه.ضمنهاالروسوحرمانبلعدد,يكنجسيمةلإعادةلم.يكنوالحلفاءبالقنابلهو,بحثخسائرالدفاعبالهجومعن.فرنسيةمارشالبينيتودحرثم,وصلبشريةالرايخبالحربتم.</textarea>
 </body>
 </html>