Merge pull request #961 from JuliaDocs/fe/backport-0.21.4

Backports for 0.21.4
JuliaDocs · Feb 16, 2019 · 5312e33 · 5312e33
2 parents 089b64a + f867ad4
commit 5312e33
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Documenter.jl changelog
 
+## Version `v0.21.4`
+
+* ![Bugfix][badge-bugfix] A bug in `jldoctest`-blocks that, in rare cases, resulted in
+  wrong output has been fixed. ([#959][github-959], [#960][github-960])
+
 ## Version `v0.21.3`
 
 * ![Security][badge-security] The lunr.js and lodash JavaScript dependencies have been updated to their latest patch versions (from 2.3.1 to 2.3.5 and 4.17.4 to 4.17.11, respectively).
@@ -197,6 +202,8 @@
 [github-927]: https://github.com/JuliaDocs/Documenter.jl/pull/927
 [github-934]: https://github.com/JuliaDocs/Documenter.jl/pull/934
 [github-946]: https://github.com/JuliaDocs/Documenter.jl/pull/946
+[github-959]: https://github.com/JuliaDocs/Documenter.jl/pull/959
+[github-960]: https://github.com/JuliaDocs/Documenter.jl/pull/960
 
 [documenterlatex]: https://github.com/JuliaDocs/DocumenterLaTeX.jl
 [documentermarkdown]: https://github.com/JuliaDocs/DocumenterMarkdown.jl

diff --git a/src/DocTests.jl b/src/DocTests.jl
@@ -158,9 +158,10 @@ function eval_repl(block, sandbox, meta::Dict, doc::Documents.Document, page)
             result.hide = REPL.ends_with_semicolon(str)
             (value, success, backtrace, text) = Utilities.withoutput() do
                 disable_color() do
-                    Core.eval(sandbox, Expr(:(=), :ans, ex))
+                    Core.eval(sandbox, ex)
                 end
             end
+            Core.eval(sandbox, Expr(:global, Expr(:(=), :ans, QuoteNode(value))))
             result.value = value
             print(result.stdout, text)
             if !success

diff --git a/src/Expanders.jl b/src/Expanders.jl
@@ -488,9 +488,10 @@ function Selectors.runner(::Type{ExampleBlocks}, x, page, doc)
         for (ex, str) in Utilities.parseblock(code, doc, page; keywords = false)
             (value, success, backtrace, text) = Utilities.withoutput() do
                 cd(dirname(page.build)) do
-                    Core.eval(mod, Expr(:(=), :ans, ex))
+                    Core.eval(mod, ex)
                 end
             end
+            Core.eval(mod, Expr(:global, Expr(:(=), :ans, QuoteNode(value))))
             result = value
             print(buffer, text)
             if !success
@@ -548,9 +549,10 @@ function Selectors.runner(::Type{REPLBlocks}, x, page, doc)
         input  = droplines(str)
         (value, success, backtrace, text) = Utilities.withoutput() do
             cd(dirname(page.build)) do
-                Core.eval(mod, Expr(:(=), :ans, ex))
+                Core.eval(mod, ex)
             end
         end
+        Core.eval(mod, Expr(:global, Expr(:(=), :ans, QuoteNode(value))))
         result = value
         output = if success
             hide = REPL.ends_with_semicolon(input)

diff --git a/test/examples/src/index.md b/test/examples/src/index.md
@@ -386,6 +386,14 @@ julia> ans
 1
 ```
 
+```jldoctest issue959
+julia> "hello"; "world"
+"world"
+
+julia> ans
+"world"
+```
+
 # Issue513
 
 ```jldoctest named