No commit message

UniFormal · Jul 28, 2016 · 261b160 · 261b160
1 parent 56cbede
commit 261b160
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/src/jEdit-mmt/src/info/kwarc/mmt/jedit/MMTSideKick.scala b/src/jEdit-mmt/src/info/kwarc/mmt/jedit/MMTSideKick.scala
@@ -97,7 +97,7 @@ class MMTSideKick extends SideKickParser("mmt") with Logger {
          val uri = utils.FileURI(path)
          val text = buffer.getText
          val nsMap = controller.getNamespaceMap
-         val ps = controller.backend.resolvePhysical(path) match {
+         val ps = controller.backend.resolvePhysical(path) orElse controller.backend.resolveAnyPhysicalAndLoad(path) match {
             case None =>
                ParsingStream.fromString(text, DPath(uri), path.getExtension.getOrElse(""), Some(nsMap))
             case Some((a, p)) =>

diff --git a/src/jEdit-mmt/src/resources/plugin/properties b/src/jEdit-mmt/src/resources/plugin/properties
@@ -4,5 +4,6 @@ buffer.encoding=UTF-8
 view.expandOnInput=true
 view.wrapGuide=false
 sidekick-tree.dock-position=left
+sidekick.buffer-save-parse=true
 error-list.dock-position=bottom
 view.showBufferSwitcher=false
diff --git a/src/mmt-api/src/main/info/kwarc/mmt/api/backend/Backend.scala b/src/mmt-api/src/main/info/kwarc/mmt/api/backend/Backend.scala
@@ -212,6 +212,14 @@ class Backend(extman: ExtensionManager, val report: info.kwarc.mmt.api.frontend.
        }
     }
   }
+  /** like resolveAnyPhysical but automatically loads and returns the archive */
+  def resolveAnyPhysicalAndLoad(f: File): Option[(Archive, List[String])] = {
+    resolveAnyPhysical(f) flatMap {
+      case (root,rel) =>
+        openArchive(root)
+        getArchive(root) map {a => (a, rel.tail)}
+    }
+  }
 
   /** creates and registers a RealizationArchive */
   def openRealizationArchive(file: File) {