Sidekick syntax is derived from buffer (and its mode), instead of parser name;
authorwenzelm
Mon, 01 Dec 2014 17:51:07 +0100
changeset 59075 9f87eb298b75
parent 59074 7836d927ffca
child 59076 65babcd8b0e6
Sidekick syntax is derived from buffer (and its mode), instead of parser name;
src/Tools/jEdit/src/isabelle.scala
src/Tools/jEdit/src/isabelle_sidekick.scala
--- a/src/Tools/jEdit/src/isabelle.scala	Mon Dec 01 17:43:23 2014 +0100
+++ b/src/Tools/jEdit/src/isabelle.scala	Mon Dec 01 17:51:07 2014 +0100
@@ -30,7 +30,6 @@
     List(
       "isabelle",         // theory source
       "isabelle-ml",      // ML source
-      "isabelle-markup",  // SideKick markup tree
       "isabelle-news",    // NEWS
       "isabelle-options", // etc/options
       "isabelle-output",  // pretty text area output
@@ -56,7 +55,7 @@
 
   def mode_syntax(name: String): Option[Outer_Syntax] =
     name match {
-      case "isabelle" | "isabelle-markup" => session_syntax()
+      case "isabelle" => session_syntax()
       case "isabelle-options" => Some(Options.options_syntax)
       case "isabelle-root" => Some(Build.root_syntax)
       case "isabelle-ml" => Some(ml_syntax)
--- a/src/Tools/jEdit/src/isabelle_sidekick.scala	Mon Dec 01 17:43:23 2014 +0100
+++ b/src/Tools/jEdit/src/isabelle_sidekick.scala	Mon Dec 01 17:51:07 2014 +0100
@@ -83,7 +83,7 @@
 
     // FIXME lock buffer (!??)
     val data = Isabelle_Sidekick.root_data(buffer)
-    val syntax = Isabelle.mode_syntax(name)
+    val syntax = Isabelle.buffer_syntax(buffer)
     val ok =
       if (syntax.isDefined) {
         val ok = parser(buffer, syntax.get, data)