src/Tools/jEdit/src/rendering.scala

--- a/src/Tools/jEdit/src/rendering.scala	Tue Feb 25 20:46:09 2014 +0100
+++ b/src/Tools/jEdit/src/rendering.scala	Tue Feb 25 20:57:57 2014 +0100
@@ -152,7 +152,7 @@
 
   private val completion_names_elements = Set(Markup.COMPLETION)
 
-  private val completion_context_elements =
+  private val language_context_elements =
     Set(Markup.STRING, Markup.ALTSTRING, Markup.VERBATIM,
       Markup.CARTOUCHE, Markup.COMMENT, Markup.LANGUAGE,
       Markup.ML_STRING, Markup.ML_COMMENT)
@@ -288,16 +288,16 @@
         }).headOption.map(_.info)
     }
 
-  def completion_context(range: Text.Range): Option[Completion.Context] =
-    snapshot.select(range, Rendering.completion_context_elements, _ =>
+  def language_context(range: Text.Range): Option[Completion.Language_Context] =
+    snapshot.select(range, Rendering.language_context_elements, _ =>
       {
         case Text.Info(_, XML.Elem(Markup.Language(language, symbols, antiquotes), _)) =>
-          Some(Completion.Context(language, symbols, antiquotes))
+          Some(Completion.Language_Context(language, symbols, antiquotes))
         case Text.Info(_, elem)
         if elem.name == Markup.ML_STRING || elem.name == Markup.ML_COMMENT =>
-          Some(Completion.Context.ML_inner)
+          Some(Completion.Language_Context.ML_inner)
         case Text.Info(_, _) =>
-          Some(Completion.Context.inner)
+          Some(Completion.Language_Context.inner)
       }).headOption.map(_.info)