clarified signature;
authorwenzelm
Fri, 27 Jun 2025 14:41:18 +0200
changeset 82780 beba766806ed
parent 82779 ec6eb16e4692
child 82781 7dd048f6ead6
clarified signature;
src/Pure/Build/build.scala
src/Pure/Build/build_job.scala
src/Pure/PIDE/headless.scala
src/Pure/PIDE/session.scala
src/Tools/Find_Facts/src/find_facts.scala
src/Tools/VSCode/src/vscode_session.scala
src/Tools/jEdit/src/jedit_session.scala
--- a/src/Pure/Build/build.scala	Fri Jun 27 13:44:36 2025 +0200
+++ b/src/Pure/Build/build.scala	Fri Jun 27 14:41:18 2025 +0200
@@ -786,7 +786,7 @@
     metric: Pretty.Metric = Symbol.Metric,
     unicode_symbols: Boolean = false
   ): Unit = {
-    val session = new Session(options)
+    val session = new Session { override def session_options: Options = options }
     val store = session.store
 
     def check(filter: List[Regex], make_string: => String): Boolean =
--- a/src/Pure/Build/build_job.scala	Fri Jun 27 13:44:36 2025 +0200
+++ b/src/Pure/Build/build_job.scala	Fri Jun 27 14:41:18 2025 +0200
@@ -171,7 +171,9 @@
           /* session */
 
           val session =
-            new Session(options) {
+            new Session {
+              override def session_options: Options = options
+
               override val store: Store = build_context.store
 
               override val resources: Resources =
--- a/src/Pure/PIDE/headless.scala	Fri Jun 27 13:44:36 2025 +0200
+++ b/src/Pure/PIDE/headless.scala	Fri Jun 27 14:41:18 2025 +0200
@@ -47,9 +47,11 @@
     session_name: String,
     _session_options: => Options,
     _resources: Headless.Resources)
-  extends isabelle.Session(_session_options) {
+  extends isabelle.Session {
     session =>
 
+    override def session_options: Options = _session_options
+
     override def resources: Headless.Resources = _resources
 
     private def loaded_theory(name: Document.Node.Name): Boolean =
--- a/src/Pure/PIDE/session.scala	Fri Jun 27 13:44:36 2025 +0200
+++ b/src/Pure/PIDE/session.scala	Fri Jun 27 14:41:18 2025 +0200
@@ -121,15 +121,17 @@
 }
 
 
-class Session(_session_options: => Options) extends Document.Session {
+abstract class Session extends Document.Session {
   session =>
 
+  def session_options: Options
+
   def resources: Resources = Resources.bootstrap
 
   val init_time: Time = Time.now()
   def print_now(): String = (Time.now() - init_time).toString
 
-  val store: Store = Store(_session_options)
+  val store: Store = Store(session_options)
   def cache: Rich_Text.Cache = store.cache
 
   def build_blobs_info(name: Document.Node.Name): Command.Blobs_Info = Command.Blobs_Info.empty
@@ -154,8 +156,6 @@
 
   /* dynamic session options */
 
-  def session_options: Options = _session_options
-
   def load_delay: Time = session_options.seconds("editor_load_delay")
   def input_delay: Time = session_options.seconds("editor_input_delay")
   def generated_input_delay: Time = session_options.seconds("editor_generated_input_delay")
--- a/src/Tools/Find_Facts/src/find_facts.scala	Fri Jun 27 13:44:36 2025 +0200
+++ b/src/Tools/Find_Facts/src/find_facts.scala	Fri Jun 27 14:41:18 2025 +0200
@@ -627,7 +627,7 @@
   ): Unit = {
     val solr = Solr.init(solr_data_dir)
     val database = options.string("find_facts_database_name")
-    val session = Session(options)
+    val session = new Session { override def session_options: Options = options }
 
     val selection = Sessions.Selection(sessions = sessions)
     val sessions_structure =
--- a/src/Tools/VSCode/src/vscode_session.scala	Fri Jun 27 13:44:36 2025 +0200
+++ b/src/Tools/VSCode/src/vscode_session.scala	Fri Jun 27 14:41:18 2025 +0200
@@ -13,6 +13,7 @@
 class VSCode_Session(
   _session_options: => Options,
   _resources: VSCode_Resources
-) extends Session(_session_options) {
+) extends Session {
+  override def session_options: Options = _session_options
   override def resources: VSCode_Resources = _resources
 }
--- a/src/Tools/jEdit/src/jedit_session.scala	Fri Jun 27 13:44:36 2025 +0200
+++ b/src/Tools/jEdit/src/jedit_session.scala	Fri Jun 27 14:41:18 2025 +0200
@@ -161,9 +161,10 @@
   }
 }
 
-class JEdit_Session(_session_options: => Options) extends Session(_session_options) {
-  override val resources: JEdit_Resources = JEdit_Resources(_session_options)
-  override val store: Store = Store(JEdit_Session.session_options(_session_options))
+class JEdit_Session(_session_options: => Options) extends Session {
+  override def session_options: Options = _session_options
+  override val resources: JEdit_Resources = JEdit_Resources(session_options)
+  override val store: Store = Store(JEdit_Session.session_options(session_options))
 
   override def auto_resolve: Boolean = session_options.bool("jedit_auto_resolve")
 }