Merge branch 'master' of github.com:rails/rails

1 files changed, 33 insertions, 23 deletions

diff --git a/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
index 274f6f2f22..ff72592b94 100644
--- a/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
@@ -35,10 +35,23 @@ module ActionDispatch
 
       if env['action_dispatch.show_detailed_exceptions']
         request = Request.new(env)
+        traces = traces_from_wrapper(wrapper)
+
+        trace_to_show = 'Application Trace'
+        if traces[trace_to_show].empty?
+          trace_to_show = 'Full Trace'
+        end
+
+        if source_to_show = traces[trace_to_show].first
+          source_to_show_id = source_to_show[:id]
+        end
+
         template = ActionView::Base.new([RESCUES_TEMPLATE_PATH],
           request: request,
           exception: wrapper.exception,
-          traces: traces_from_wrapper(wrapper),
+          traces: traces,
+          show_source_idx: source_to_show_id,
+          trace_to_show: trace_to_show,
           routes_inspector: routes_inspector(exception),
           source_extract: wrapper.source_extract,
           line_number: wrapper.line_number,
@@ -97,31 +110,28 @@ module ActionDispatch
     # 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 }
+      framework_trace   = wrapper.framework_trace
+      full_trace        = wrapper.full_trace
+
+      appplication_trace_with_ids = []
+      framework_trace_with_ids = []
+      full_trace_with_ids = []
+
+      if full_trace
+        full_trace.each_with_index do |trace, idx|
+          id_trace = {
+            id: idx,
+            trace: trace
+          }
+          appplication_trace_with_ids << id_trace if application_trace.include? trace
+          framework_trace_with_ids << id_trace if framework_trace.include? trace
+          full_trace_with_ids << id_trace
         end
-
-        full_trace = application_trace + framework_trace
       end
-
       {
-        "Application Trace" => application_trace,
-        "Framework Trace" => framework_trace,
-        "Full Trace" => full_trace
+        "Application Trace" => appplication_trace_with_ids,
+        "Framework Trace" => framework_trace_with_ids,
+        "Full Trace" => full_trace_with_ids
       }
     end
   end