Apache Lucene open-source search software
hunspell: disallow hidden title-case entries from compound middle/end (#12220)
Peter Gromov56aef7265aef
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/Hunspell.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/Hunspell.javaindex 998bfc77429..1e2a1add13c 100644--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/Hunspell.java+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/Hunspell.java@@ -164,7 +164,7 @@ public class Hunspell {Root<CharsRef> findStem(char[] wordChars, int offset, int length, WordCase originalCase, WordContext context) {checkCanceled.run();- boolean checkCase = context != COMPOUND_MIDDLE && context != COMPOUND_END;+ WordCase toCheck = context != COMPOUND_MIDDLE && context != COMPOUND_END ? originalCase : null;@SuppressWarnings({"rawtypes", "unchecked"})Root<CharsRef>[] result = new Root[1];stemmer.doStem(@@ -173,7 +173,7 @@ public class Hunspell {length,context,(stem, formID, morphDataId, outerPrefix, innerPrefix, outerSuffix, innerSuffix) -> {- if (checkCase && !acceptCase(originalCase, formID, stem)) {+ if (!acceptCase(toCheck, formID, stem)) {return dictionary.hasFlag(formID, Dictionary.HIDDEN_FLAG);}if (acceptsStem(formID)) {diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestSpellChecking.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestSpellChecking.javaindex d1b6bea03b3..cbb6f21f0cf 100644--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestSpellChecking.java+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestSpellChecking.java@@ -205,6 +205,10 @@ public class TestSpellChecking extends LuceneTestCase {doTest("germancompounding");}+ public void testGermanManualCase() throws Exception {+ doTest("germanManualCase");+ }+public void testApplyOconvToSuggestions() throws Exception {doTest("oconv");}diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/germanManualCase.aff b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/germanManualCase.affnew file mode 100644index 00000000000..85274dfec8d--- /dev/null+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/germanManualCase.aff@@ -0,0 +1,51 @@+# no CHECKCOMPOUNDCASE++# compound flags++COMPOUNDBEGIN U+COMPOUNDMIDDLE V+COMPOUNDEND W++ONLYINCOMPOUND X+COMPOUNDPERMITFLAG P++COMPOUNDMIN 1+WORDCHARS -++# dash prefix for compounds with dash (Arbeits-Computer)++PFX - Y 1+PFX - 0 -/P .++# decapitalizing prefix++PFX D Y 29+PFX D A a/PX A+PFX D � �/PX �+PFX D B b/PX B+PFX D C c/PX C+PFX D D d/PX D+PFX D E e/PX E+PFX D F f/PX F+PFX D G g/PX G+PFX D H h/PX H+PFX D I i/PX I+PFX D J j/PX J+PFX D K k/PX K+PFX D L l/PX L+PFX D M m/PX M+PFX D N n/PX N+PFX D O o/PX O+PFX D � �/PX �+PFX D P p/PX P+PFX D Q q/PX Q+PFX D R r/PX R+PFX D S s/PX S+PFX D T t/PX T+PFX D U u/PX U+PFX D � �/PX �+PFX D V v/PX V+PFX D W w/PX W+PFX D X x/PX X+PFX D Y y/PX Y+PFX D Z z/PX Zdiff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/germanManualCase.dic b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/germanManualCase.dicnew file mode 100644index 00000000000..5e075003c9a--- /dev/null+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/germanManualCase.dic@@ -0,0 +1,5 @@+4+uART/XW-+bein/XW-+Stand/UX+UART/-\ No newline at end of filediff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/germanManualCase.good b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/germanManualCase.goodnew file mode 100644index 00000000000..27c6941024f--- /dev/null+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/germanManualCase.good@@ -0,0 +1,3 @@+UART+Standbein+Stand-uARTdiff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/germanManualCase.wrong b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/germanManualCase.wrongnew file mode 100644index 00000000000..c3ce031400c--- /dev/null+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/germanManualCase.wrong@@ -0,0 +1,3 @@+StandUart+uART+Uart