discontinued odd workaround for scala-2.9.2, which is hopefully obsolete in scala-2.10.x;
authorwenzelm
Mon May 20 13:54:24 2013 +0200 (2013-05-20 ago)
changeset 5208129566b6810f7
parent 52080 02749038168b
child 52082 559e1398b70e
discontinued odd workaround for scala-2.9.2, which is hopefully obsolete in scala-2.10.x;
src/Tools/jEdit/src/active.scala
src/Tools/jEdit/src/rendering.scala
     1.1 --- a/src/Tools/jEdit/src/active.scala	Mon May 20 13:38:48 2013 +0200
     1.2 +++ b/src/Tools/jEdit/src/active.scala	Mon May 20 13:54:24 2013 +0200
     1.3 @@ -77,14 +77,10 @@
     1.4                      else text_area.setSelectedText(text)
     1.5                  }
     1.6  
     1.7 +              case Protocol.Dialog(id, serial, result) =>
     1.8 +                model.session.dialog_result(id, serial, result)
     1.9 +
    1.10                case _ =>
    1.11 -                // FIXME pattern match problem in scala-2.9.2 (!??)
    1.12 -                elem match {
    1.13 -                  case Protocol.Dialog(id, serial, result) =>
    1.14 -                    model.session.dialog_result(id, serial, result)
    1.15 -
    1.16 -                  case _ =>
    1.17 -                }
    1.18              }
    1.19            }
    1.20          }
     2.1 --- a/src/Tools/jEdit/src/rendering.scala	Mon May 20 13:38:48 2013 +0200
     2.2 +++ b/src/Tools/jEdit/src/rendering.scala	Mon May 20 13:54:24 2013 +0200
     2.3 @@ -481,17 +481,12 @@
     2.4                  (None, Some(bad_color))
     2.5                case (_, Text.Info(_, XML.Elem(Markup(Markup.INTENSIFY, _), _))) =>
     2.6                  (None, Some(intensify_color))
     2.7 -              case (acc, Text.Info(_, elem @ XML.Elem(Markup(Markup.DIALOG, _), _))) =>
     2.8 -                // FIXME pattern match problem in scala-2.9.2 (!??)
     2.9 -                elem match {
    2.10 -                  case Protocol.Dialog(_, serial, result) =>
    2.11 -                    command_state.results.get(serial) match {
    2.12 -                      case Some(Protocol.Dialog_Result(res)) if res == result =>
    2.13 -                        (None, Some(active_result_color))
    2.14 -                      case _ =>
    2.15 -                        (None, Some(active_color))
    2.16 -                    }
    2.17 -                  case _ => acc
    2.18 +              case (acc, Text.Info(_, Protocol.Dialog(_, serial, result))) =>
    2.19 +                command_state.results.get(serial) match {
    2.20 +                  case Some(Protocol.Dialog_Result(res)) if res == result =>
    2.21 +                    (None, Some(active_result_color))
    2.22 +                  case _ =>
    2.23 +                    (None, Some(active_color))
    2.24                  }
    2.25                case (_, Text.Info(_, XML.Elem(markup, _))) if active_include(markup.name) =>
    2.26                  (None, Some(active_color))