1 files changed, 50 insertions, 13 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
index 64230ff1ae..274f6f2f22 100644
--- a/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
@@ -34,27 +34,33 @@ module ActionDispatch
       log_error(env, wrapper)
 
       if env['action_dispatch.show_detailed_exceptions']
+        request = Request.new(env)
         template = ActionView::Base.new([RESCUES_TEMPLATE_PATH],
-          :request => Request.new(env),
-          :exception => wrapper.exception,
-          :application_trace => wrapper.application_trace,
-          :framework_trace => wrapper.framework_trace,
-          :full_trace => wrapper.full_trace,
-          :routes_inspector => routes_inspector(exception),
-          :source_extract => wrapper.source_extract,
-          :line_number => wrapper.line_number,
-          :file => wrapper.file
+          request: request,
+          exception: wrapper.exception,
+          traces: traces_from_wrapper(wrapper),
+          routes_inspector: routes_inspector(exception),
+          source_extract: wrapper.source_extract,
+          line_number: wrapper.line_number,
+          file: wrapper.file
         )
         file = "rescues/#{wrapper.rescue_template}"
-        body = template.render(:template => file, :layout => 'rescues/layout')
-        render(wrapper.status_code, body)
+
+        if request.xhr?
+          body = template.render(template: file, layout: false, formats: [:text])
+          format = "text/plain"
+        else
+          body = template.render(template: file, layout: 'rescues/layout')
+          format = "text/html"
+        end
+        render(wrapper.status_code, body, format)
       else
         raise exception
       end
     end
 
-    def render(status, body)
-      [status, {'Content-Type' => "text/html; charset=#{Response.default_charset}", 'Content-Length' => body.bytesize.to_s}, [body]]
+    def render(status, body, format)
+      [status, {'Content-Type' => "#{format}; charset=#{Response.default_charset}", 'Content-Length' => body.bytesize.to_s}, [body]]
     end
 
     def log_error(env, wrapper)
@@ -87,5 +93,36 @@ module ActionDispatch
         ActionDispatch::Routing::RoutesInspector.new(@routes_app.routes.routes)
       end
     end
+
+    # Augment the exception traces by providing ids for all unique stack frame
+    def traces_from_wrapper(wrapper)
+      application_trace = wrapper.application_trace
+      framework_trace = wrapper.framework_trace
+      full_trace = wrapper.full_trace
+
+      if application_trace && framework_trace
+        id_counter = 0
+
+        application_trace = application_trace.map do |trace|
+          prev = id_counter
+          id_counter += 1
+          { id: prev, trace: trace }
+        end
+
+        framework_trace = framework_trace.map do |trace|
+          prev = id_counter
+          id_counter += 1
+          { id: prev, trace: trace }
+        end
+
+        full_trace = application_trace + framework_trace
+      end
+
+      {
+        "Application Trace" => application_trace,
+        "Framework Trace" => framework_trace,
+        "Full Trace" => full_trace
+      }
+    end
   end
 end