livebook-dev/livebook
1
1
Fork 0
mirror of https://github.com/livebook-dev/livebook.git synced 2025-10-09 04:57:18 +08:00
Code Issues Projects Releases Packages Wiki Activity

Provide better stacktraces on recent Elixir+OTP versions (#1028)

Browse source
This commit is contained in:
José Valim 2022-02-24 19:19:22 +01:00 • committed by GitHub
parent f5c99737dd
commit 3622d0ee4b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
lib/livebook/runtime/evaluator.ex
View file

@ -428,25 +428,34 @@ defmodule Livebook.Runtime.Evaluator do
defp code_error?(_error), do: false defp code_error?(_error), do: false
# Adapted from https://github.com/elixir-lang/elixir/blob/1c1654c88adfdbef38ff07fc30f6fbd34a542c07/lib/iex/lib/iex/evaluator.ex#L355-L372 # Adapted from https://github.com/elixir-lang/elixir/blob/1c1654c88adfdbef38ff07fc30f6fbd34a542c07/lib/iex/lib/iex/evaluator.ex#L355-L372
# TODO: Remove else branch once we depend on the versions below
if System.otp_release() >= "25" and Version.match?(System.version(), "~> 1.14-dev") do
defp prune_stacktrace(stack) do
stack
|> Enum.reverse()
|> Enum.drop_while(&(elem(&1, 0) != :elixir_eval))
|> Enum.reverse()
end
else
@elixir_internals [:elixir, :elixir_expand, :elixir_compiler, :elixir_module] ++
[:elixir_clauses, :elixir_lexical, :elixir_def, :elixir_map] ++
[:elixir_erl, :elixir_erl_clauses, :elixir_erl_pass]
@elixir_internals [:elixir, :elixir_expand, :elixir_compiler, :elixir_module] ++ defp prune_stacktrace(stacktrace) do
[:elixir_clauses, :elixir_lexical, :elixir_def, :elixir_map] ++ # The order in which each drop_while is listed is important.
[:elixir_erl, :elixir_erl_clauses, :elixir_erl_pass] # For example, the user may call Code.eval_string/2 in their
# code and if there is an error we should not remove erl_eval
defp prune_stacktrace(stacktrace) do # and eval_bits information from the user stacktrace.
# The order in which each drop_while is listed is important. stacktrace
# For example, the user may call Code.eval_string/2 in their |> Enum.reverse()
# code and if there is an error we should not remove erl_eval |> Enum.drop_while(&(elem(&1, 0) == :proc_lib))
# and eval_bits information from the user stacktrace. |> Enum.drop_while(&(elem(&1, 0) == :gen_server))
stacktrace |> Enum.drop_while(&(elem(&1, 0) == __MODULE__))
|> Enum.reverse() |> Enum.drop_while(&(elem(&1, 0) == :elixir))
|> Enum.drop_while(&(elem(&1, 0) == :proc_lib)) |> Enum.drop_while(&(elem(&1, 0) in [:erl_eval, :eval_bits]))
|> Enum.drop_while(&(elem(&1, 0) == :gen_server)) |> Enum.reverse()
|> Enum.drop_while(&(elem(&1, 0) == __MODULE__)) |> Enum.reject(&(elem(&1, 0) in @elixir_internals))
|> Enum.drop_while(&(elem(&1, 0) == :elixir)) end
|> Enum.drop_while(&(elem(&1, 0) in [:erl_eval, :eval_bits]))
|> Enum.reverse()
|> Enum.reject(&(elem(&1, 0) in @elixir_internals))
end end
defp random_id() do defp random_id() do