Merge pull request #1543 from JuliaDocs/backports-0.26.3

Backports for 0.26.3
JuliaDocs · Mar 2, 2021 · abf4722 · abf4722 · mortenpi · Mar 2, 2021
2 parents cbc21f5 + 378adf7
commit abf4722
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Documenter.jl changelog
 
+## Version `v0.26.3`
+
+* ![Maintenance][badge-maintenance] The internal naming of the temporary modules used to run doctests changed to accommodate upcoming printing changes in Julia. ([JuliaLang/julia#39841][julia-39841], [#1540][github-1540])
+
 ## Version `v0.26.2`
 
 * ![Enhancement][badge-enhancement] `doctest()` no longer throws an error if cleaning up the temporary directory fails for some reason. ([#1513][github-1513], [#1526][github-1526])
@@ -746,8 +750,10 @@
 [github-1520]: https://github.com/JuliaDocs/Documenter.jl/pull/1520
 [github-1526]: https://github.com/JuliaDocs/Documenter.jl/pull/1526
 [github-1527]: https://github.com/JuliaDocs/Documenter.jl/pull/1527
+[github-1540]: https://github.com/JuliaDocs/Documenter.jl/pull/1540
 
 [julia-38079]: https://github.com/JuliaLang/julia/issues/38079
+[julia-39841]: https://github.com/JuliaLang/julia/pull/39841
 
 [documenterlatex]: https://github.com/JuliaDocs/DocumenterLaTeX.jl
 [documentermarkdown]: https://github.com/JuliaDocs/DocumenterMarkdown.jl

diff --git a/Project.toml b/Project.toml
@@ -1,6 +1,6 @@
 name = "Documenter"
 uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
-version = "0.26.2"
+version = "0.26.3"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

diff --git a/src/DocTests.jl b/src/DocTests.jl
@@ -124,7 +124,11 @@ function doctest(ctx::DocTestContext, block_immutable::Markdown2.CodeBlock)
     if startswith(lang, "jldoctest")
         # Define new module or reuse an old one from this page if we have a named doctest.
         name = match(r"jldoctest[ ]?(.*)$", split(lang, ';', limit = 2)[1])[1]
-        sym = isempty(name) ? gensym("doctest-") : Symbol("doctest-", name)
+        if isempty(name)
+            sym = Symbol("__doctest__", lstrip(string(gensym()), '#'))
+        else
+            sym = Symbol("__doctest__named__", name)
+        end
         sandbox = get!(() -> Expanders.get_new_sandbox(sym), ctx.meta, sym)
 
         # Normalise line endings.