Pull request #118: Bugfix: Handle Windows line endings when reading t…

…ext resources Merge in PAC/chatbook from bugfix/windows-line-endings to main * commit '86da847c8657b301dcde673b5cb0f74ca6ce7535': Increment paclet version Bugfix: Handle Windows line endings when reading text resources
WolframResearch · Dec 3, 2024 · 8cc691f · 8cc691f
2 parents b773bc2 + 86da847
commit 8cc691f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/PacletInfo.wl b/PacletInfo.wl
@@ -1,7 +1,7 @@
 PacletObject[ <|
     "Name"           -> "Wolfram/Chatbook",
     "PublisherID"    -> "Wolfram",
-    "Version"        -> "1.5.2.17",
+    "Version"        -> "1.5.2.18",
     "WolframVersion" -> "14.1+",
     "Description"    -> "Wolfram Notebooks + LLMs",
     "License"        -> "MIT",

diff --git a/Source/Chatbook/Common.wl b/Source/Chatbook/Common.wl
@@ -1391,8 +1391,15 @@ getCloudChatbookExpressions[ ] := Enclose[
             First[
                 StringCases[
                     string,
-                    Shortest[ "@@resource ChatbookExpressions\n{" ~~ exprs__ ~~ "}\n@|" ] :>
-                        Association @ ToExpression[ "{" <> exprs <> "}" ],
+                    Shortest @ StringExpression[
+                        "@@resource ChatbookExpressions",
+                        WhitespaceCharacter...,
+                        "{",
+                        exprs__,
+                        "}",
+                        WhitespaceCharacter...,
+                        "@|"
+                    ] :> Association @ ToExpression[ "{" <> exprs <> "}" ],
                     1
                 ],
                 $Failed