Use annoted source code in Template:Error to avoid special cases in the show exceptions middleware.

1 files changed, 4 insertions, 8 deletions

diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
index 12a93d6a24..2dd2ec9fe9 100644
--- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
@@ -133,14 +133,10 @@ module ActionDispatch
         return unless logger
 
         ActiveSupport::Deprecation.silence do
-          if ActionView::Template::Error === exception
-            logger.fatal(exception.to_s)
-          else
-            logger.fatal(
-              "\n#{exception.class} (#{exception.message}):\n  " +
-              clean_backtrace(exception).join("\n  ") + "\n\n"
-            )
-          end
+          message = "\n#{exception.class} (#{exception.message}):\n"
+          message << exception.annoted_source_code if exception.respond_to?(:annoted_source_code)
+          message << exception.backtrace.join("\n  ")
+          logger.fatal("#{message}\n\n")
         end
       end