src/Tools/jEdit/src/rendering.scala
changeset 55646 ec4651c697e3
parent 55626 0e2b7f04c944
child 55647 106a57dec7af
--- a/src/Tools/jEdit/src/rendering.scala	Fri Feb 21 12:07:38 2014 +0100
+++ b/src/Tools/jEdit/src/rendering.scala	Fri Feb 21 12:32:06 2014 +0100
@@ -231,19 +231,16 @@
 
   val overview_limit = options.int("jedit_text_overview_limit")
 
-  private val overview_elements =
-    Protocol.command_status_markup + Markup.WARNING + Markup.ERROR
-
   def overview_color(range: Text.Range): Option[Color] =
   {
     if (snapshot.is_outdated) None
     else {
       val results =
         snapshot.cumulate_markup[(Protocol.Status, Int)](
-          range, (Protocol.Status.init, 0), overview_elements, _ =>
+          range, (Protocol.Status.init, 0), Protocol.status_elements, _ =>
           {
             case ((status, pri), Text.Info(_, elem)) =>
-              if (Protocol.command_status_markup(elem.name))
+              if (Protocol.command_status_elements(elem.name))
                 Some((Protocol.command_status(status, elem.markup), pri))
               else
                 Some((status, pri max Rendering.message_pri(elem.name)))
@@ -534,7 +531,8 @@
     Rendering.warning_pri -> warning_color,
     Rendering.error_pri -> error_color)
 
-  private val squiggly_elements = Set(Markup.WRITELN, Markup.WARNING, Markup.ERROR)
+  private val squiggly_elements =
+    Set(Markup.WRITELN, Markup.WARNING, Markup.ERROR)
 
   def squiggly_underline(range: Text.Range): List[Text.Info[Color]] =
   {
@@ -597,7 +595,7 @@
   /* text background */
 
   private val background1_elements =
-    Protocol.command_status_markup + Markup.WRITELN_MESSAGE + Markup.TRACING_MESSAGE +
+    Protocol.command_status_elements + Markup.WRITELN_MESSAGE + Markup.TRACING_MESSAGE +
       Markup.WARNING_MESSAGE + Markup.ERROR_MESSAGE + Markup.BAD + Markup.INTENSIFY ++
       active_elements
 
@@ -611,7 +609,7 @@
             range, (Some(Protocol.Status.init), None), background1_elements, command_state =>
             {
               case (((Some(status), color), Text.Info(_, XML.Elem(markup, _))))
-              if (Protocol.command_status_markup(markup.name)) =>
+              if (Protocol.command_status_elements(markup.name)) =>
                 Some((Some(Protocol.command_status(status, markup)), color))
               case (_, Text.Info(_, XML.Elem(Markup(Markup.BAD, _), _))) =>
                 Some((None, Some(bad_color)))