closes #427 by ignoring lines parsed as nothing in code blocks (#428)

tlienart · Mar 25, 2020 · a0e2032 · tlienart · Mar 25, 2020 · a0e2032
1 parent 43bbc9b
commit a0e2032
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "Franklin"
 uuid = "713c75ef-9fc9-4b05-94a9-213340da978e"
 authors = ["Thibaut Lienart <[email protected]>"]
-version = "0.6.12"
+version = "0.6.13"
 
 [deps]
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"

diff --git a/src/eval/run.jl b/src/eval/run.jl
@@ -12,11 +12,12 @@ Consumes a string with Julia code, returns a vector of expression(s).
 Note: this function was adapted from the `parse_input` function from Weave.jl.
 """
 function parse_code(code::AS)
-    exs = Union{Expr,Nothing}[]
+    exs = Expr[]
     n   = sizeof(code)
     pos = 1
     while pos ≤ n
         ex, pos = Meta.parse(code, pos)
+        isnothing(ex) && continue
         push!(exs, ex)
     end
     exs

diff --git a/test/eval/eval_fs2.jl b/test/eval/eval_fs2.jl
@@ -253,4 +253,22 @@ end
         <pre><code class="plaintext">hello
         10</code></pre>
         """)
+
+    # issue 427
+    h = raw"""
+        @def hascode = true
+        @def reeval = true
+        ```julia:ex
+        a = 5
+        a *= 2
+        # hello
+        ```
+        \show{ex}
+        """ |> fd2html_td
+    @test isapproxstr(h, """
+        <pre><code class="language-julia">a = 5
+        a *= 2
+        # hello</code></pre>
+        <pre><code class="plaintext">10</code></pre>
+        """)
 end