Merge pull request #540 from WolframResearch/539-loading-a-subcontext…

…-with-needs-behaves-badly-when-chatbook-is-already-loaded-via-mx-file Fix unnecessary loading of package files when Chatbook subcontexts are loaded via `Needs`
WolframResearch · Jan 12, 2024 · 8922d2d · 8922d2d
2 parents 390c78b + daf0d15
commit 8922d2d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/Source/Chatbook/Chatbook.wl b/Source/Chatbook/Chatbook.wl
@@ -12,7 +12,15 @@ Quiet[
         Unprotect[ "Wolfram`Chatbook`*" ];
         ClearAll[ "Wolfram`Chatbook`*" ];
         ClearAll[ "Wolfram`Chatbook`*`*" ];
-        Get @ Wolfram`ChatbookLoader`$MXFile
+        Get @ Wolfram`ChatbookLoader`$MXFile;
+        (* Ensure all subcontexts are in $Packages to avoid reloading subcontexts out of order: *)
+        If[ MatchQ[ Wolfram`Chatbook`$ChatbookContexts, { __String } ],
+            WithCleanup[
+                Unprotect @ $Packages,
+                $Packages = DeleteDuplicates @ Join[ $Packages, Wolfram`Chatbook`$ChatbookContexts ],
+                Protect @ $Packages
+            ]
+        ]
         ,
         WithCleanup[
             PreemptProtect[

diff --git a/Source/Chatbook/Main.wl b/Source/Chatbook/Main.wl
@@ -8,6 +8,7 @@ BeginPackage[ "Wolfram`Chatbook`" ];
 (*Declare Symbols*)
 `$AvailableTools;
 `$ChatAbort;
+`$ChatbookContexts;
 `$ChatHandlerData;
 `$ChatPost;
 `$ChatPre;
@@ -131,6 +132,11 @@ Protect[
     WriteChatOutputCell
 ];
 
+(* ::**************************************************************************************************************:: *)
+(* ::Section::Closed:: *)
+(*Subcontexts*)
+$ChatbookContexts = Select[ Contexts[ "Wolfram`Chatbook`*" ], StringFreeQ[ "`Private`" ] ];
+
 (* ::**************************************************************************************************************:: *)
 (* ::Section::Closed:: *)
 (*Package Footer*)