src/Tools/jEdit/src/rendering.scala
changeset 55749 75a48dc4383e
parent 55747 bef19c929ba5
child 55765 ec7ca5388dea
     1.1 --- a/src/Tools/jEdit/src/rendering.scala	Tue Feb 25 20:46:09 2014 +0100
     1.2 +++ b/src/Tools/jEdit/src/rendering.scala	Tue Feb 25 20:57:57 2014 +0100
     1.3 @@ -152,7 +152,7 @@
     1.4  
     1.5    private val completion_names_elements = Set(Markup.COMPLETION)
     1.6  
     1.7 -  private val completion_context_elements =
     1.8 +  private val language_context_elements =
     1.9      Set(Markup.STRING, Markup.ALTSTRING, Markup.VERBATIM,
    1.10        Markup.CARTOUCHE, Markup.COMMENT, Markup.LANGUAGE,
    1.11        Markup.ML_STRING, Markup.ML_COMMENT)
    1.12 @@ -288,16 +288,16 @@
    1.13          }).headOption.map(_.info)
    1.14      }
    1.15  
    1.16 -  def completion_context(range: Text.Range): Option[Completion.Context] =
    1.17 -    snapshot.select(range, Rendering.completion_context_elements, _ =>
    1.18 +  def language_context(range: Text.Range): Option[Completion.Language_Context] =
    1.19 +    snapshot.select(range, Rendering.language_context_elements, _ =>
    1.20        {
    1.21          case Text.Info(_, XML.Elem(Markup.Language(language, symbols, antiquotes), _)) =>
    1.22 -          Some(Completion.Context(language, symbols, antiquotes))
    1.23 +          Some(Completion.Language_Context(language, symbols, antiquotes))
    1.24          case Text.Info(_, elem)
    1.25          if elem.name == Markup.ML_STRING || elem.name == Markup.ML_COMMENT =>
    1.26 -          Some(Completion.Context.ML_inner)
    1.27 +          Some(Completion.Language_Context.ML_inner)
    1.28          case Text.Info(_, _) =>
    1.29 -          Some(Completion.Context.inner)
    1.30 +          Some(Completion.Language_Context.inner)
    1.31        }).headOption.map(_.info)
    1.32  
    1.33