# HG changeset patch
# User wenzelm
# Date 1397647701 -7200
# Node ID 4f45570e532dcb477172485689ce91c14527c7a3
# Parent  e7e20d72756a1597a04e3541c96fa28e6d909d52
more uniform treatment of word case for check / complete;

diff -r e7e20d72756a -r 4f45570e532d src/Tools/jEdit/src/spell_checker.scala
--- a/src/Tools/jEdit/src/spell_checker.scala	Wed Apr 16 12:32:36 2014 +0200
+++ b/src/Tools/jEdit/src/spell_checker.scala	Wed Apr 16 13:28:21 2014 +0200
@@ -143,6 +143,9 @@
 {
   override def toString: String = dictionary.toString
 
+
+  /* main dictionary content */
+
   private var dict = new Object
   private var updates = SortedMap.empty[String, Spell_Checker.Update]
 
@@ -239,6 +242,9 @@
   def reset_enabled(): Int =
     updates.valuesIterator.filter(upd => !upd.permanent).length
 
+
+  /* check known words */
+
   def contains(word: String): Boolean =
   {
     val m = dict.getClass.getSuperclass.getDeclaredMethod("exist", classOf[String])
@@ -248,24 +254,47 @@
 
   def check(word: String): Boolean =
     word match {
-      case Word.Case(Word.Uppercase) => contains(Word.lowercase(word))
-      case Word.Case(Word.Capitalized) =>
-        contains(Word.lowercase(word)) || contains(Word.uppercase(word))
-      case _ => contains(word)
+      case Word.Case(c) if c != Word.Lowercase =>
+        contains(word) || contains(Word.lowercase(word))
+      case _ =>
+        contains(word)
     }
 
+  def marked_words(base: Text.Offset, text: String): List[Text.Info[String]] =
+    Spell_Checker.marked_words(base, text, info => !check(info.info))
+
+
+  /* suggestions for unknown words */
+
+  private def suggestions(word: String): Option[List[String]] =
+  {
+    val m = dict.getClass.getSuperclass.getDeclaredMethod("searchSuggestions", classOf[String])
+    m.setAccessible(true)
+    val res =
+      m.invoke(dict, word).asInstanceOf[java.util.List[AnyRef]].toArray.toList.map(_.toString)
+    if (res.isEmpty) None else Some(res)
+  }
+
   def complete(word: String): List[String] =
     if (check(word)) Nil
     else {
-      val m = dict.getClass.getSuperclass.getDeclaredMethod("searchSuggestions", classOf[String])
-      m.setAccessible(true)
-      m.invoke(dict, word).asInstanceOf[java.util.List[AnyRef]].toArray.toList.map(_.toString)
+      val word_case = Word.Case.unapply(word)
+      def recover_case(s: String) =
+        word_case match {
+          case Some(c) => Word.Case(c, s)
+          case None => s
+        }
+      val result =
+        word_case match {
+          case Some(c) if c != Word.Lowercase =>
+            suggestions(word) orElse suggestions(Word.lowercase(word))
+          case _ =>
+            suggestions(word)
+        }
+      result.getOrElse(Nil).map(recover_case)
     }
 
   def complete_enabled(word: String): Boolean = !complete(word).isEmpty
-
-  def marked_words(base: Text.Offset, text: String): List[Text.Info[String]] =
-    Spell_Checker.marked_words(base, text, info => !check(info.info))
 }