Merge branch 'main' into repo-assist/perf-compile-regex-2026-04-10-f88f43f8587c44e1

Author: dsyme

.github/workflows/pull-requests.yml

@@ -45,7 +45,7 @@ jobs:
       run: dotnet fsi build.fsx
 
     - name: Upload test results
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       if: failure()
       with:
         name: test-results-${{ matrix.os }}

.github/workflows/push-main.yml

@@ -43,7 +43,7 @@ jobs:
       run: dotnet fsi build.fsx
 
     - name: Upload test results
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       if: failure()
       with:
         name: test-results-ubuntu

Directory.Packages.props

@@ -14,14 +14,14 @@
     <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="" PrivateAssets="all" />
     <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="" PrivateAssets="all" />
     <PackageVersion Include="Ionide.ProjInfo" Version="0.74.2" />
-    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
     <PackageVersion Include="Suave" Version="2.6.2" />
-    <PackageVersion Include="System.Memory" Version="4.5.5" />
+    <PackageVersion Include="System.Memory" Version="4.6.3" />
     <PackageVersion Include="System.Text.Json" Version="10.0.5" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" />
     <PackageVersion Include="NUnit" Version="4.5.1" />
     <PackageVersion Include="FsUnit" Version="7.1.1" />
-    <PackageVersion Include="FSharp.Data" Version="8.1.6" />
+    <PackageVersion Include="FSharp.Data" Version="8.1.7" />
     <PackageVersion Include="NUnit3TestAdapter" Version="6.2.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
     <PackageVersion Include="Ionide.KeepAChangelog.Tasks" Version="0.3.3" />

RELEASE_NOTES.md

@@ -4,7 +4,12 @@
 
 ### Changed
 * Compile `Regex` instances to module-level singletons (with `RegexOptions.Compiled`) in `PageContentList`, `HtmlFormatting`, `Formatting`, `Menu`, and `LlmsTxt`. Previously a new, uncompiled `Regex` was constructed on every call (once per page heading, once per HTML page, once per menu item, once per llms.txt entry), incurring repeated JIT overhead. The patterns are now compiled once at module load and reused across all calls.
+* Replace deprecated `System.Net.WebClient` with `System.Net.Http.HttpClient` in the image downloader used by `--saveimages`. Removes the `#nowarn "44"` suppression.
+* Bump `Newtonsoft.Json` transitive-dependency pin from 13.0.3 to 13.0.4.
+* Bump `System.Memory` transitive-dependency pin from 4.5.5 to 4.6.3.0
+
 ### Fixed
+* Fix `Markdown.ToMd` silently dropping `EmbedParagraphs` nodes: the serialiser now delegates to the node's `Render()` method and formats the resulting paragraphs, consistent with the HTML and LaTeX back-ends.
 * Fix `Markdown.ToMd` dropping link titles in `DirectLink` and `DirectImage` spans. Links with a title attribute (e.g. `[text](url "title")`) now round-trip correctly; without this fix the title was silently discarded on serialisation.
 * Fix `Markdown.ToMd` serialising inline code spans that contain backtick characters. Previously, `InlineCode` was always wrapped in single backticks, producing syntactically incorrect Markdown when the code body contained backticks. Now the serialiser selects the shortest backtick fence that does not collide with the body content (e.g. a double-backtick fence for bodies containing single backticks, triple for double, etc.), matching the CommonMark spec.
 

src/FSharp.Formatting.Markdown/MarkdownUtils.fs

@@ -160,12 +160,19 @@ module internal MarkdownUtils =
     let rec formatParagraph (ctx: FormattingContext) paragraph =
         [ match paragraph with
           | LatexBlock(env, lines, _) ->
-              yield sprintf "\\begin{%s}" env
+              // Single-line equation blocks are rendered with the compact $$...$$ notation
+              // (which is also valid markdown and what most authors write). Multi-line or
+              // non-standard environments keep the \begin{env}...\end{env} form.
+              if env = "equation" && lines.Length = 1 then
+                  yield sprintf "$$%s$$" lines.[0]
+              else
+                  yield sprintf "\\begin{%s}" env
 
-              for line in lines do
-                  yield line
+                  for line in lines do
+                      yield line
+
+                  yield sprintf "\\end{%s}" env
 
-              yield sprintf "\\end{%s}" env
               yield ""
 
           | Heading(n, spans, _) ->
@@ -280,9 +287,7 @@ module internal MarkdownUtils =
                       yield "> " + line
 
                   yield ""
-          | _ ->
-              printfn "// can't yet format %0A to markdown" paragraph
-              yield "" ]
+          | EmbedParagraphs(cmd, _) -> yield! cmd.Render() |> Seq.collect (formatParagraph ctx) ]
 
     /// Strips <c>#if SYMBOL</c> / <c>#endif // SYMBOL</c> conditional compilation lines from an .fsx code block
     /// so that format-specific sections are removed from non-target output formats.

src/fsdocs-tool/BuildCommand.fs

@@ -8,6 +8,7 @@ open System.Diagnostics
 open System.IO
 open System.Globalization
 open System.Net
+open System.Net.Http
 open System.Reflection
 open System.Text
 
@@ -29,7 +30,6 @@ open Suave.Filters
 open Suave.Logging
 open FSharp.Formatting.Markdown
 
-#nowarn "44" // Obsolete WebClient
 
 /// Convert markdown, script and other content into a static site
 type internal DocContent
@@ -48,7 +48,7 @@ type internal DocContent
 
     let createImageSaver (rootOutputFolderAsGiven) =
         // Download images so that they can be embedded
-        let wc = new WebClient()
+        let http = new HttpClient()
         let mutable counter = 0
 
         fun (url: string) ->
@@ -65,7 +65,8 @@ type internal DocContent
 
                 ensureDirectory (sprintf "%s/savedimages" rootOutputFolderAsGiven)
                 printfn "downloading %s --> %s" url fn
-                wc.DownloadFile(url, fn)
+                let bytes = http.GetByteArrayAsync(url).GetAwaiter().GetResult()
+                File.WriteAllBytes(fn, bytes)
                 url2
             else
                 url

tests/FSharp.Markdown.Tests/Markdown.fs

@@ -1417,3 +1417,108 @@ let ``ToMd round-trip: indirect image with unresolved reference`` () =
     let result = Markdown.ToMd(doc)
     // When key is not resolved, should preserve the indirect form
     result |> should contain "![alt text][unknown-ref]"
+
+// --------------------------------------------------------------------------------------
+// ToMd additional coverage: headings, nested structures, LaTeX display math, inline code
+// --------------------------------------------------------------------------------------
+
+[<Test>]
+let ``ToMd preserves heading level 4`` () =
+    "#### Heading Four" |> toMd |> shouldEqual "#### Heading Four"
+
+[<Test>]
+let ``ToMd preserves heading level 5`` () =
+    "##### Heading Five" |> toMd |> shouldEqual "##### Heading Five"
+
+[<Test>]
+let ``ToMd preserves heading level 6`` () =
+    "###### Heading Six" |> toMd |> shouldEqual "###### Heading Six"
+
+[<Test>]
+let ``ToMd preserves emphasis inside a heading`` () =
+    let result = "## Hello *world*" |> toMd
+    result |> should contain "## Hello *world*"
+
+[<Test>]
+let ``ToMd preserves strong text inside a heading`` () =
+    let result = "## Hello **world**" |> toMd
+    result |> should contain "## Hello **world**"
+
+[<Test>]
+let ``ToMd preserves LaTeX display math`` () =
+    let md = "$$E = mc^2$$"
+    let result = toMd md
+    result |> should contain "$$E = mc^2$$"
+
+[<Test>]
+let ``ToMd preserves inline code containing special chars`` () =
+    let md = "Use `a + b = c` inline."
+    let result = toMd md
+    result |> should contain "`a + b = c`"
+
+[<Test>]
+let ``ToMd preserves nested unordered list`` () =
+    // Outer list item containing an inner list
+    let md = "* outer\n\n  * inner"
+    let result = toMd md
+    result |> should contain "outer"
+    result |> should contain "inner"
+
+[<Test>]
+let ``ToMd preserves a nested blockquote`` () =
+    // A blockquote that itself contains a blockquote
+    let md = "> > inner quote"
+    let result = toMd md
+    result |> should contain "> "
+    result |> should contain "inner quote"
+    // The inner quote marker should appear in the output (two levels of '>')
+    result |> should contain "> >"
+
+[<Test>]
+let ``ToMd preserves emphasis inside a blockquote`` () =
+    let md = "> *italic text*"
+    let result = toMd md
+    result |> should contain "> "
+    result |> should contain "*italic text*"
+
+[<Test>]
+let ``ToMd preserves inline code inside a blockquote`` () =
+    let md = "> use `printf` here"
+    let result = toMd md
+    result |> should contain "> "
+    result |> should contain "`printf`"
+
+[<Test>]
+let ``ToMd preserves a code block without language`` () =
+    let md = "```\nsome code\n```"
+    let result = toMd md
+    result |> should contain "some code"
+    result |> should contain "```"
+
+[<Test>]
+let ``ToMd preserves horizontal rule (dash variant)`` () =
+    let md = "---"
+    let result = toMd md
+    result |> should contain "---"
+
+[<Test>]
+let ``ToMd preserves a link with a title`` () =
+    // Title attribute is allowed in Markdown links
+    let md = "[FSharp](https://fsharp.org \"F# home\")"
+    let result = toMd md
+    result |> should contain "[FSharp]("
+    result |> should contain "https://fsharp.org"
+
+[<Test>]
+let ``ToMd serialises EmbedParagraphs by delegating to Render()`` () =
+    // EmbedParagraphs was previously falling through to the catch-all '| _' branch,
+    // emitting a debug printfn and yielding an empty string.  It should instead
+    // delegate to the Render() method and format the resulting paragraphs.
+    let inner =
+        { new MarkdownEmbedParagraphs with
+            member _.Render() =
+                [ Paragraph([ Literal("embedded text", MarkdownRange.zero) ], MarkdownRange.zero) ] }
+
+    let doc = MarkdownDocument([ EmbedParagraphs(inner, MarkdownRange.zero) ], dict [])
+    let result = Markdown.ToMd(doc)
+    result |> should contain "embedded text"