Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Approximate error display of REPL. #261

Merged
merged 3 commits into from
Oct 17, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 18 additions & 9 deletions src/Literate.jl
Original file line number Diff line number Diff line change
Expand Up @@ -936,15 +936,24 @@ function execute_block(sb::Module, block::String; inputfile::String, fake_source
end
end
popdisplay(disp) # IOCapture.capture has a try-catch so should always end up here
if c.error && !continue_on_error
error("""
$(sprint(showerror, c.value))
when executing the following code block from inputfile `$(Base.contractuser(inputfile))`

```julia
$block
```
""")
if c.error
if continue_on_error
err = c.value
if err isa LoadError # include_string may wrap error in LoadError
err = err.error
end
error_output = "ERROR: " * sprint(showerror, err)
return nothing, error_output, disp.data
fredrikekre marked this conversation as resolved.
Show resolved Hide resolved
else
error("""
$(sprint(showerror, c.value))
when executing the following code block from inputfile `$(Base.contractuser(inputfile))`

```julia
$block
```
""")
end
end
return c.value, c.output, disp.data
end
Expand Down
2 changes: 1 addition & 1 deletion test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -1471,7 +1471,7 @@ end end
write(inputfile, input_with_error)
Literate.markdown(inputfile, sandbox; continue_on_error = true, execute = true)
output_md = read(joinpath(sandbox, "input.md"), String)
@test occursin("DomainError(-1.0", output_md)
@test occursin("ERROR: DomainError with -1.0", output_md)
end
end

Expand Down