support several sidekick parsers -- very basic default parser;

--- a/src/Tools/jEdit/plugin/services.xml	Fri May 07 22:38:13 2010 +0200
+++ b/src/Tools/jEdit/plugin/services.xml	Fri May 07 23:44:10 2010 +0200
@@ -6,7 +6,10 @@
 		new isabelle.jedit.Isabelle_Encoding();
 	</SERVICE>
 	<SERVICE NAME="isabelle" CLASS="sidekick.SideKickParser">
-		new isabelle.jedit.Isabelle_Sidekick();
+		new isabelle.jedit.Isabelle_Sidekick_Default();
+	</SERVICE>
+	<SERVICE NAME="isabelle-raw" CLASS="sidekick.SideKickParser">
+		new isabelle.jedit.Isabelle_Sidekick_Raw();
 	</SERVICE>
   <SERVICE NAME="isabelle" CLASS="gatchan.jedit.hyperlinks.HyperlinkSource">
     new isabelle.jedit.Isabelle_Hyperlinks();

--- a/src/Tools/jEdit/src/jedit/isabelle_sidekick.scala	Fri May 07 22:38:13 2010 +0200
+++ b/src/Tools/jEdit/src/jedit/isabelle_sidekick.scala	Fri May 07 23:44:10 2010 +0200
@@ -1,5 +1,5 @@
 /*
- * SideKick parser for Isabelle proof documents
+ * SideKick parsers for Isabelle proof documents
  *
  * @author Fabian Immler, TU Munich
  * @author Makarius
@@ -22,17 +22,26 @@
 import sidekick.{SideKickParser, SideKickParsedData, SideKickCompletion, IAsset}
 
 
-class Isabelle_Sidekick extends SideKickParser("isabelle")
+object Isabelle_Sidekick
+{
+  implicit def int_to_pos(offset: Int): Position =
+    new Position { def getOffset = offset; override def toString = offset.toString }
+}
+
+
+class Isabelle_Sidekick(name: String,
+    parser: (() => Boolean, SideKickParsedData, Document_Model) => Unit)
+  extends SideKickParser(name)
 {
   /* parsing */
 
   @volatile private var stopped = false
+  private def is_stopped(): Boolean = stopped
   override def stop() = { stopped = true }
 
   def parse(buffer: Buffer, error_source: DefaultErrorSource): SideKickParsedData =
   {
-    implicit def int_to_pos(offset: Int): Position =
-      new Position { def getOffset = offset; override def toString = offset.toString }
+    import Isabelle_Sidekick.int_to_pos
 
     stopped = false
 
@@ -43,34 +52,14 @@
 
     Swing_Thread.now { Document_Model(buffer) } match {
       case Some(model) =>
-        val document = model.recent_document()
-        for ((command, command_start) <- document.command_range(0) if !stopped) {
-          root.add(document.current_state(command).get.markup_root.swing_tree((node: Markup_Node) =>
-              {
-                val content = Pretty.str_of(List(XML.Text(command.source(node.start, node.stop))))
-                val id = command.id
-
-                new DefaultMutableTreeNode(new IAsset {
-                  override def getIcon: Icon = null
-                  override def getShortString: String = content
-                  override def getLongString: String = node.info.toString
-                  override def getName: String = id
-                  override def setName(name: String) = ()
-                  override def setStart(start: Position) = ()
-                  override def getStart: Position = command_start + node.start
-                  override def setEnd(end: Position) = ()
-                  override def getEnd: Position = command_start + node.stop
-                  override def toString = id + ": " + content + "[" + getStart + " - " + getEnd + "]"
-                })
-              }))
-        }
+        parser(is_stopped, data, model)
         if (stopped) root.add(new DefaultMutableTreeNode("<parser stopped>"))
       case None => root.add(new DefaultMutableTreeNode("<buffer inactive>"))
     }
     data
   }
 
-  
+
   /* completion */
 
   override def supportsCompletion = true
@@ -98,3 +87,65 @@
     }
   }
 }
+
+
+class Isabelle_Sidekick_Default extends Isabelle_Sidekick("isabelle",
+  ((is_stopped: () => Boolean, data: SideKickParsedData, model: Document_Model) =>
+    {
+      import Isabelle_Sidekick.int_to_pos
+
+      val root = data.root
+      val document = model.recent_document()
+      for {
+        (command, command_start) <- document.command_range(0)
+        if command.is_command && !is_stopped()
+      }
+      {
+        val name = command.name
+        val node =
+          new DefaultMutableTreeNode(new IAsset {
+            override def getIcon: Icon = null
+            override def getShortString: String = name
+            override def getLongString: String = name
+            override def getName: String = name
+            override def setName(name: String) = ()
+            override def setStart(start: Position) = ()
+            override def getStart: Position = command_start
+            override def setEnd(end: Position) = ()
+            override def getEnd: Position = command_start + command.length
+            override def toString = name
+          })
+        root.add(node)
+      }
+    }))
+
+
+class Isabelle_Sidekick_Raw extends Isabelle_Sidekick("isabelle-raw",
+  ((is_stopped: () => Boolean, data: SideKickParsedData, model: Document_Model) =>
+    {
+      import Isabelle_Sidekick.int_to_pos
+
+      val root = data.root
+      val document = model.recent_document()
+      for ((command, command_start) <- document.command_range(0) if !is_stopped()) {
+        root.add(document.current_state(command).get.markup_root.swing_tree((node: Markup_Node) =>
+            {
+              val content = Pretty.str_of(List(XML.Text(command.source(node.start, node.stop))))
+              val id = command.id
+
+              new DefaultMutableTreeNode(new IAsset {
+                override def getIcon: Icon = null
+                override def getShortString: String = content
+                override def getLongString: String = node.info.toString
+                override def getName: String = id
+                override def setName(name: String) = ()
+                override def setStart(start: Position) = ()
+                override def getStart: Position = command_start + node.start
+                override def setEnd(end: Position) = ()
+                override def getEnd: Position = command_start + node.stop
+                override def toString = id + ": " + content + "[" + getStart + " - " + getEnd + "]"
+              })
+            }))
+      }
+    }))
+