Fix indentation in Logger.Translator

Signed-off-by: José Valim <[email protected]>

Author: whatyouhide

lib/logger/lib/logger/translator.ex

@@ -97,7 +97,7 @@ defmodule Logger.Translator do
                             [supervisor: sup, errorContext: context,
                              reason: reason,
                              offender: [{:pid, pid}, {name_or_id, name} | offender]])
-                           when is_pid(pid) and context !== :shutdown and name_or_id in [:name, :id] do
+       when is_pid(pid) and context !== :shutdown and name_or_id in [:name, :id] do
     {:ok, ["Child ", inspect(name), " of Supervisor ",
             sup_name(sup), ?\s, sup_context(context),
             "\n** (exit) ", offender_reason(reason, context),
@@ -106,37 +106,37 @@ defmodule Logger.Translator do
   end
 
   defp translate_supervisor(min_level,
-                           [supervisor: sup, errorContext: context,
+                            [supervisor: sup, errorContext: context,
                              reason: reason,
                              offender: [{:pid, _pid},
                                         {name_or_id, name} | offender]]) when name_or_id in [:name, :id] do
     {:ok, ["Child ", inspect(name), " of Supervisor ",
-            sup_name(sup), ?\s, sup_context(context),
-            "\n** (exit) ", offender_reason(reason, context) |
-            child_info(min_level, offender)]}
+           sup_name(sup), ?\s, sup_context(context),
+           "\n** (exit) ", offender_reason(reason, context) |
+           child_info(min_level, offender)]}
   end
 
   defp translate_supervisor(min_level,
-                           [supervisor: sup, errorContext: context,
+                            [supervisor: sup, errorContext: context,
                              reason: reason,
                              offender: [{:pid, pid} | offender]]) do
     {:ok, ["Child of Supervisor ",
-            sup_name(sup), ?\s, sup_context(context),
-            "\n** (exit) ", offender_reason(reason, context),
-            "\nPid: ", inspect(pid) |
-            child_info(min_level, offender)]}
+           sup_name(sup), ?\s, sup_context(context),
+           "\n** (exit) ", offender_reason(reason, context),
+           "\nPid: ", inspect(pid) |
+           child_info(min_level, offender)]}
   end
 
   defp translate_supervisor(min_level,
-                           [supervisor: sup, errorContext: context,
+                            [supervisor: sup, errorContext: context,
                              reason: reason,
                              offender: [{:nb_children, n},
                                         {name_or_id, name} | offender]]) when name_or_id in [:name, :id] do
     {:ok, ["Children ", inspect(name), " of Supervisor ",
-            sup_name(sup), ?\s, sup_context(context),
-            "\n** (exit) ", offender_reason(reason, context),
-            "\nNumber: ", inspect(n) |
-            child_info(min_level, offender)]}
+           sup_name(sup), ?\s, sup_context(context),
+           "\n** (exit) ", offender_reason(reason, context),
+           "\nNumber: ", inspect(n) |
+           child_info(min_level, offender)]}
   end
 
   defp translate_supervisor(_min_level, _other), do: :none
@@ -148,19 +148,19 @@ defmodule Logger.Translator do
 
   defp translate_progress(min_level,
                           [supervisor: sup,
-                            started: [{:pid, pid}, {name_or_id, name} | started]]) when name_or_id in [:name, :id] do
+                           started: [{:pid, pid}, {name_or_id, name} | started]]) when name_or_id in [:name, :id] do
     {:ok, ["Child ", inspect(name), " of Supervisor ",
-            sup_name(sup), " started",
-            "\nPid: ", inspect(pid) |
-            child_info(min_level, started)]}
+           sup_name(sup), " started",
+           "\nPid: ", inspect(pid) |
+           child_info(min_level, started)]}
   end
 
   defp translate_progress(min_level,
                           [supervisor: sup,
-                            started: [{:pid, pid} | started]]) do
+                           started: [{:pid, pid} | started]]) do
     {:ok, ["Child of Supervisor ", sup_name(sup), " started",
-            "\nPid: ", inspect(pid) |
-            child_info(min_level, started)]}
+           "\nPid: ", inspect(pid) |
+           child_info(min_level, started)]}
   end
 
   defp translate_progress(_min_level, _other), do: :none
@@ -177,17 +177,17 @@ defmodule Logger.Translator do
 
   defp child_info(min_level, [{:mfargs, {mod, fun, args}} | debug]) do
     ["\nStart Call: ", format_mfa(mod, fun, args) |
-      child_debug(min_level, debug)]
+     child_debug(min_level, debug)]
   end
 
   defp child_info(min_level, [{:mfa, {mod, fun, args}} | debug]) do
     ["\nStart Call: ", format_mfa(mod, fun, args) |
-      child_debug(min_level, debug)]
+     child_debug(min_level, debug)]
   end
 
   defp child_info(min_level, [{:mod, mod} | debug]) do
     ["\nStart Module: ", inspect(mod) |
-      child_debug(min_level, debug)]
+     child_debug(min_level, debug)]
   end
 
   defp child_debug(:debug,
@@ -217,9 +217,9 @@ defmodule Logger.Translator do
                          {:error_info, {kind, exception, stack}} | crashed],
                         linked]) do
     {:ok, ["Process ", crash_name(pid, name), " terminating",
-            format(kind, exception, stack),
-            crash_info(min_level, [initial_call | crashed]) |
-            crash_linked(min_level, linked)]}
+           format(kind, exception, stack),
+           crash_info(min_level, [initial_call | crashed]) |
+           crash_linked(min_level, linked)]}
   end
 
   defp translate_crash(min_level,
@@ -228,9 +228,9 @@ defmodule Logger.Translator do
                          {:error_info, {kind, exception, stack}} | crashed],
                         linked]) do
     {:ok, ["Process ", crash_name(pid, name), " terminating",
-            format(kind, exception, stack),
-            crash_info(min_level, crashed),
-            crash_linked(min_level, linked)]}
+           format(kind, exception, stack),
+           crash_info(min_level, crashed),
+           crash_linked(min_level, linked)]}
   end
 
   defp crash_name(pid, []), do: inspect(pid)
@@ -241,13 +241,13 @@ defmodule Logger.Translator do
   defp crash_info(min_level,
                   [{:initial_call, {mod, fun, args}} | info], prefix) do
     [prefix, "Initial Call: ", crash_call(mod, fun, args) |
-      crash_info(min_level, info, prefix)]
+     crash_info(min_level, info, prefix)]
   end
 
   defp crash_info(min_level,
                   [{:current_function, {mod, fun, args}} | info], prefix) do
     [prefix, "Current Call: ", crash_call(mod, fun, args) |
-      crash_info(min_level, info, prefix)]
+     crash_info(min_level, info, prefix)]
   end
 
   defp crash_info(min_level, [{:current_function, []} | info], prefix) do
@@ -257,7 +257,7 @@ defmodule Logger.Translator do
   defp crash_info(min_level,
                   [{:ancestors, ancestors} | debug], prefix) do
     [prefix, "Ancestors: ", inspect(ancestors) |
-      crash_debug(min_level, debug, prefix)]
+     crash_debug(min_level, debug, prefix)]
   end
 
   defp crash_call(mod, fun, arity) when is_integer(arity) do
@@ -270,16 +270,16 @@ defmodule Logger.Translator do
 
   defp crash_debug(:debug,
                    [messages: msgs, links: links, dictionary: dict,
-                     trap_exit: trap, status: status, heap_size: heap_size,
-                     stack_size: stack_size, reductions: reductions], prefix) do
+                    trap_exit: trap, status: status, heap_size: heap_size,
+                    stack_size: stack_size, reductions: reductions], prefix) do
     [prefix, "Messages: ", inspect(msgs),
-      prefix, "Links: ", inspect(links),
-      prefix, "Dictionary: ", inspect(dict),
-      prefix, "Trapping Exits: ", inspect(trap),
-      prefix, "Status: ", inspect(status),
-      prefix, "Heap Size: ", inspect(heap_size),
-      prefix, "Stack Size: ", inspect(stack_size),
-      prefix, "Reductions: ", inspect(reductions)]
+     prefix, "Links: ", inspect(links),
+     prefix, "Dictionary: ", inspect(dict),
+     prefix, "Trapping Exits: ", inspect(trap),
+     prefix, "Status: ", inspect(status),
+     prefix, "Heap Size: ", inspect(heap_size),
+     prefix, "Stack Size: ", inspect(stack_size),
+     prefix, "Reductions: ", inspect(reductions)]
   end
 
   defp crash_debug(_min_level, _info, _prefix) do
@@ -298,14 +298,14 @@ defmodule Logger.Translator do
                        [{:pid, pid}, {:registered_name, []} | info]) do
     indent = "    "
     [?\n, indent, inspect(pid) |
-      crash_info(min_level, info, [?\n, indent | indent])]
+     crash_info(min_level, info, [?\n, indent | indent])]
   end
 
   defp crash_neighbour(min_level,
                        [{:pid, pid}, {:registered_name, name} | info]) do
     indent = "    "
     [?\n, indent, inspect(name), " (", inspect(pid), ")" |
-      crash_info(min_level, info, [?\n, indent | indent])]
+     crash_info(min_level, info, [?\n, indent | indent])]
   end
 
   defp format_stop({maybe_exception, [_ | _] = maybe_stacktrace} = reason) do
@@ -316,8 +316,7 @@ defmodule Logger.Translator do
         format_stop_banner(reason)
     else
       formatted_stacktrace ->
-        [format_stop_banner(maybe_exception, maybe_stacktrace) |
-          formatted_stacktrace]
+        [format_stop_banner(maybe_exception, maybe_stacktrace) | formatted_stacktrace]
     end
   end
 
@@ -333,7 +332,7 @@ defmodule Logger.Translator do
   @gen_undef [:"module could not be loaded", :"function not exported"]
 
   defp format_stop_banner(undef, [{mod, fun, args, _info} | _]  = stacktrace)
-  when undef in @gen_undef and is_atom(mod) and is_atom(fun) do
+       when undef in @gen_undef and is_atom(mod) and is_atom(fun) do
     cond do
       is_list(args) ->
         format_undef(mod, fun, length(args), undef, stacktrace)
@@ -345,8 +344,11 @@ defmodule Logger.Translator do
   end
 
   defp format_stop_banner(reason, stacktrace) do
+    # If this is already an exception (even an ErlangError), we format it as an
+    # exception. Otherwise, we try to normalize it, and if it's normalized as an
+    # ErlangError we instead format it as an exit.
     if Exception.exception?(reason) do
-        [?\n | Exception.format_banner(:error, reason, stacktrace)]
+      [?\n | Exception.format_banner(:error, reason, stacktrace)]
     else
       case Exception.normalize(:error, reason, stacktrace) do
         %ErlangError{} ->
@@ -369,9 +371,9 @@ defmodule Logger.Translator do
   end
 
   defp format_stacktrace(stacktrace) do
-      for entry <- stacktrace do
-        [<<"\n    ">> | Exception.format_stacktrace_entry(entry)]
-      end
+    for entry <- stacktrace do
+      [<<"\n    ">> | Exception.format_stacktrace_entry(entry)]
+    end
   end
 
   defp format_mfa(mod, fun, :undefined), do: [inspect(mod), ?., to_string(fun) | "/?"]