# HG changeset patch
# User wenzelm
# Date 1393240443 -3600
# Node ID 9e3d64e5919a4929565a677a7ce93b3f51fec71f
# Parent  2d623ab55672979c711ac38785edb07115046176
paint completion range of active popup;

diff -r 2d623ab55672 -r 9e3d64e5919a src/Tools/jEdit/src/completion_popup.scala
--- a/src/Tools/jEdit/src/completion_popup.scala	Mon Feb 24 11:05:02 2014 +0100
+++ b/src/Tools/jEdit/src/completion_popup.scala	Mon Feb 24 12:14:03 2014 +0100
@@ -19,7 +19,7 @@
 import scala.swing.event.MouseClicked
 
 import org.gjt.sp.jedit.View
-import org.gjt.sp.jedit.textarea.JEditTextArea
+import org.gjt.sp.jedit.textarea.{TextArea, JEditTextArea}
 import org.gjt.sp.jedit.gui.{HistoryTextField, KeyEventWorkaround}
 
 
@@ -37,6 +37,16 @@
         case _ => None
       }
 
+    def active_range(text_area0: TextArea): Option[Text.Range] =
+      text_area0 match {
+        case text_area: JEditTextArea =>
+          apply(text_area) match {
+            case Some(text_area_completion) => text_area_completion.active_range
+            case None => None
+          }
+        case _ => None
+      }
+
     def exit(text_area: JEditTextArea)
     {
       Swing_Thread.require()
@@ -69,8 +79,19 @@
 
   class Text_Area private(text_area: JEditTextArea)
   {
+    // owned by Swing thread
     private var completion_popup: Option[Completion_Popup] = None
 
+    def active_range: Option[Text.Range] =
+      completion_popup match {
+        case Some(completion) =>
+          completion.active_range match {
+            case Some((range, _)) if completion.isDisplayable => Some(range)
+            case _ => None
+          }
+        case None => None
+      }
+
 
     /* completion action */
 
@@ -109,14 +130,17 @@
         val font =
           painter.getFont.deriveFont(Rendering.font_size("jedit_popup_font_scale"))
 
-        val loc1 = text_area.offsetToXY(result.range.start)
+        val range = result.range
+        def invalidate(): Unit = JEdit_Lib.invalidate_range(text_area, range)
+
+        val loc1 = text_area.offsetToXY(range.start)
         if (loc1 != null) {
           val loc2 =
             SwingUtilities.convertPoint(painter,
               loc1.x, loc1.y + painter.getFontMetrics.getHeight, layered)
 
           val completion =
-            new Completion_Popup(layered, loc2, font, result.items) {
+            new Completion_Popup(Some((range, invalidate _)), layered, loc2, font, result.items) {
               override def complete(item: Completion.Item) {
                 PIDE.completion_history.update(item)
                 insert(item)
@@ -128,6 +152,7 @@
               override def refocus() { text_area.requestFocus }
             }
           completion_popup = Some(completion)
+          invalidate()
           completion.show_popup()
         }
       }
@@ -270,6 +295,7 @@
     // see https://forums.oracle.com/thread/1361677
     if (GUI.is_macos_laf) text_field.setCaret(new DefaultCaret)
 
+    // owned by Swing thread
     private var completion_popup: Option[Completion_Popup] = None
 
 
@@ -328,7 +354,8 @@
               val loc =
                 SwingUtilities.convertPoint(text_field, fm.stringWidth(text), fm.getHeight, layered)
 
-              val completion = new Completion_Popup(layered, loc, text_field.getFont, result.items)
+              val completion =
+                new Completion_Popup(None, layered, loc, text_field.getFont, result.items)
               {
                 override def complete(item: Completion.Item) {
                   PIDE.completion_history.update(item)
@@ -395,6 +422,7 @@
 
 
 class Completion_Popup private(
+  val active_range: Option[(Text.Range, () => Unit)],
   layered: JLayeredPane,
   location: Point,
   font: Font,
@@ -535,6 +563,7 @@
 
   private val hide_popup_delay =
     Swing_Thread.delay_last(PIDE.options.seconds("jedit_completion_dismiss_delay")) {
+      active_range match { case Some((_, invalidate)) => invalidate() case _ => }
       popup.hide
     }
 
@@ -542,8 +571,10 @@
   {
     if (list_view.peer.isFocusOwner) refocus()
 
-    if (PIDE.options.seconds("jedit_completion_dismiss_delay").is_zero)
+    if (PIDE.options.seconds("jedit_completion_dismiss_delay").is_zero) {
+      active_range match { case Some((_, invalidate)) => invalidate() case _ => }
       popup.hide
+    }
     else hide_popup_delay.invoke()
   }
 }
diff -r 2d623ab55672 -r 9e3d64e5919a src/Tools/jEdit/src/rich_text_area.scala
--- a/src/Tools/jEdit/src/rich_text_area.scala	Mon Feb 24 11:05:02 2014 +0100
+++ b/src/Tools/jEdit/src/rich_text_area.scala	Mon Feb 24 12:14:03 2014 +0100
@@ -483,14 +483,22 @@
             }
 
             // completion range
-            for {
-              caret <- caret_range.try_restrict(line_range)
-              if !hyperlink_area.is_active
-              names <- rendering.completion_names(caret)
-              r <- JEdit_Lib.gfx_range(text_area, names.range)
-            } {
-              gfx.setColor(painter.getCaretColor)
-              gfx.drawRect(r.x, y + i * line_height, r.length - 1, line_height - 1)
+            if (!hyperlink_area.is_active) {
+              def paint_completion(range: Text.Range) {
+                for (r <- JEdit_Lib.gfx_range(text_area, range)) {
+                  gfx.setColor(painter.getCaretColor)
+                  gfx.drawRect(r.x, y + i * line_height, r.length - 1, line_height - 1)
+                }
+              }
+              Completion_Popup.Text_Area.active_range(text_area) match {
+                case Some(range) if range.try_restrict(line_range).isDefined =>
+                  paint_completion(range.try_restrict(line_range).get)
+                case _ =>
+                  for {
+                    caret <- caret_range.try_restrict(line_range)
+                    names <- rendering.completion_names(caret)
+                  } paint_completion(names.range)
+              }
             }
           }
         }