src/Tools/jEdit/src/rendering.scala
changeset 61598 ed4dad8823a4
parent 61596 8323b8e21fe9
child 61601 15952a05133c
equal deleted inserted replaced
61597:53e32a9b66b8 61598:ed4dad8823a4
   141     Markup.Elements(Markup.COMPLETION, Markup.NO_COMPLETION)
   141     Markup.Elements(Markup.COMPLETION, Markup.NO_COMPLETION)
   142 
   142 
   143   private val language_context_elements =
   143   private val language_context_elements =
   144     Markup.Elements(Markup.STRING, Markup.ALT_STRING, Markup.VERBATIM,
   144     Markup.Elements(Markup.STRING, Markup.ALT_STRING, Markup.VERBATIM,
   145       Markup.CARTOUCHE, Markup.COMMENT, Markup.LANGUAGE,
   145       Markup.CARTOUCHE, Markup.COMMENT, Markup.LANGUAGE,
   146       Markup.ML_STRING, Markup.ML_CARTOUCHE, Markup.ML_COMMENT)
   146       Markup.ML_STRING, Markup.ML_COMMENT)
   147 
   147 
   148   private val language_elements = Markup.Elements(Markup.LANGUAGE)
   148   private val language_elements = Markup.Elements(Markup.LANGUAGE)
   149 
   149 
   150   private val citation_elements = Markup.Elements(Markup.CITATION)
   150   private val citation_elements = Markup.Elements(Markup.CITATION)
   151 
   151 
   307       {
   307       {
   308         case Text.Info(_, XML.Elem(Markup.Language(language, symbols, antiquotes, delimited), _)) =>
   308         case Text.Info(_, XML.Elem(Markup.Language(language, symbols, antiquotes, delimited), _)) =>
   309           if (delimited) Some(Completion.Language_Context(language, symbols, antiquotes))
   309           if (delimited) Some(Completion.Language_Context(language, symbols, antiquotes))
   310           else None
   310           else None
   311         case Text.Info(_, elem)
   311         case Text.Info(_, elem)
   312         if elem.name == Markup.ML_STRING ||
   312         if elem.name == Markup.ML_STRING || elem.name == Markup.ML_COMMENT =>
   313           elem.name == Markup.ML_CARTOUCHE ||
       
   314           elem.name == Markup.ML_COMMENT =>
       
   315           Some(Completion.Language_Context.ML_inner)
   313           Some(Completion.Language_Context.ML_inner)
   316         case Text.Info(_, _) =>
   314         case Text.Info(_, _) =>
   317           Some(Completion.Language_Context.inner)
   315           Some(Completion.Language_Context.inner)
   318       }).headOption.map(_.info)
   316       }).headOption.map(_.info)
   319 
   317 
   776       Markup.ML_KEYWORD3 -> keyword3_color,
   774       Markup.ML_KEYWORD3 -> keyword3_color,
   777       Markup.ML_DELIMITER -> foreground_color,
   775       Markup.ML_DELIMITER -> foreground_color,
   778       Markup.ML_NUMERAL -> inner_numeral_color,
   776       Markup.ML_NUMERAL -> inner_numeral_color,
   779       Markup.ML_CHAR -> inner_quoted_color,
   777       Markup.ML_CHAR -> inner_quoted_color,
   780       Markup.ML_STRING -> inner_quoted_color,
   778       Markup.ML_STRING -> inner_quoted_color,
   781       Markup.ML_CARTOUCHE -> inner_cartouche_color,
       
   782       Markup.ML_COMMENT -> inner_comment_color,
   779       Markup.ML_COMMENT -> inner_comment_color,
   783       Markup.SML_STRING -> inner_quoted_color,
   780       Markup.SML_STRING -> inner_quoted_color,
   784       Markup.SML_COMMENT -> inner_comment_color)
   781       Markup.SML_COMMENT -> inner_comment_color)
   785 
   782 
   786   private lazy val text_color_elements =
   783   private lazy val text_color_elements =