From 88ab742327f08379254980eeb0d50fa20df70b6d Mon Sep 17 00:00:00 2001
From: ST John <st--@users.noreply.github.com>
Date: Tue, 29 Jun 2021 16:19:10 +0300
Subject: [PATCH] include inputfile in errors

---
 src/Literate.jl | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Literate.jl b/src/Literate.jl
index bb6ef16..822d457 100644
--- a/src/Literate.jl
+++ b/src/Literate.jl
@@ -458,7 +458,7 @@ function markdown(inputfile, outputdir=pwd(); config::Dict=Dict(), kwargs...)
             write_code = !(all(l -> endswith(l, "#hide"), chunk.lines) && !(config["documenter"]::Bool))
             write_code && write(iomd, seekstart(iocode))
             if config["execute"]::Bool
-                execute_markdown!(iomd, sb, join(chunk.lines, '\n'), outputdir)
+                execute_markdown!(iomd, sb, join(chunk.lines, '\n'), outputdir; inputfile)
             end
         end
         write(iomd, '\n') # add a newline between each chunk
@@ -472,9 +472,9 @@ function markdown(inputfile, outputdir=pwd(); config::Dict=Dict(), kwargs...)
     return outputfile
 end
 
-function execute_markdown!(io::IO, sb::Module, block::String, outputdir)
+function execute_markdown!(io::IO, sb::Module, block::String, outputdir; inputfile::String="")
     # TODO: Deal with explicit display(...) calls
-    r, str, _ = execute_block(sb, block)
+    r, str, _ = execute_block(sb, block; inputfile)
     plain_fence = "\n```\n" =>  "\n```" # issue #101: consecutive codefenced blocks need newline
     if r !== nothing && !REPL.ends_with_semicolon(block)
         for (mime, ext) in [(MIME("image/png"), ".png"), (MIME("image/jpeg"), ".jpeg")]
@@ -537,14 +537,14 @@ function notebook(inputfile, outputdir=pwd(); config::Dict=Dict(), kwargs...)
         preprocessor(inputfile, outputdir; user_config=config, user_kwargs=kwargs, type=:nb)
 
     # create the notebook
-    nb = jupyter_notebook(chunks, config)
+    nb = jupyter_notebook(chunks, config; inputfile)
 
     # write to file
     outputfile = write_result(nb, config; print = (io, c)->JSON.print(io, c, 1))
     return outputfile
 end
 
-function jupyter_notebook(chunks, config)
+function jupyter_notebook(chunks, config; inputfile::String="")
     nb = Dict()
     nb["nbformat"] = JUPYTER_VERSION.major
     nb["nbformat_minor"] = JUPYTER_VERSION.minor
@@ -601,7 +601,7 @@ function jupyter_notebook(chunks, config)
         @info "executing notebook `$(config["name"] * ".ipynb")`"
         try
             cd(config["literate_outputdir"]) do
-                nb = execute_notebook(nb)
+                nb = execute_notebook(nb; inputfile)
             end
         catch err
             @error "error when executing notebook based on input file: " *
@@ -612,7 +612,7 @@ function jupyter_notebook(chunks, config)
     return nb
 end
 
-function execute_notebook(nb)
+function execute_notebook(nb; inputfile::String="")
     sb = sandbox()
     execution_count = 0
     for cell in nb["cells"]
@@ -620,7 +620,7 @@ function execute_notebook(nb)
         execution_count += 1
         cell["execution_count"] = execution_count
         block = join(cell["source"])
-        r, str, display_dicts = execute_block(sb, block)
+        r, str, display_dicts = execute_block(sb, block; inputfile)
 
         # str should go into stream
         if !isempty(str)
@@ -702,7 +702,7 @@ function Base.display(ld::LiterateDisplay, mime::MIME, x)
 end
 
 # Execute a code-block in a module and capture stdout/stderr and the result
-function execute_block(sb::Module, block::String)
+function execute_block(sb::Module, block::String; inputfile::String="")
     @debug """execute_block($sb, block)
     ```
     $(block)
@@ -724,7 +724,7 @@ function execute_block(sb::Module, block::String)
     if c.error
         error("""
              $(sprint(showerror, c.value))
-             when executing the following code block
+             when executing the following code block in $inputfile
 
              ```julia
              $block