Fix handling of backtrace lines that don't have a file path

fractaledmind · Jan 29, 2024 · 638001e · 638001e
1 parent 3036b27
commit 638001e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/app/models/solid_errors/backtrace_line.rb b/app/models/solid_errors/backtrace_line.rb
@@ -29,7 +29,7 @@ class BacktraceLine
     attr_reader :file
     attr_reader :number
     attr_reader :method
-    attr_reader :filtered_file, :filtered_number, :filtered_method
+    attr_reader :filtered_file, :filtered_number, :filtered_method, :unparsed_line
 
     # Parses a single line of a given backtrace
     #
@@ -47,13 +47,14 @@ def self.parse(unparsed_line, opts = {})
 
         file, number, method = match[1], match[2], match[3]
         filtered_args = [fmatch[1], fmatch[2], fmatch[3]]
-        new(file, number, method, *filtered_args, opts.fetch(:source_radius, 2))
+        new(unparsed_line, file, number, method, *filtered_args, opts.fetch(:source_radius, 2))
       end
     end
 
-    def initialize(file, number, method, filtered_file = file,
+    def initialize(unparsed_line, file, number, method, filtered_file = file,
       filtered_number = number, filtered_method = method,
       source_radius = 2)
+      self.unparsed_line = unparsed_line
       self.filtered_file = filtered_file
       self.filtered_number = filtered_number
       self.filtered_method = filtered_method
@@ -87,7 +88,7 @@ def source
 
     private
 
-    attr_writer :file, :number, :method, :filtered_file, :filtered_number, :filtered_method
+    attr_writer :file, :number, :method, :filtered_file, :filtered_number, :filtered_method, :unparsed_line
 
     attr_accessor :source_radius
 

diff --git a/app/views/solid_errors/error_mailer/error_occurred.text.erb b/app/views/solid_errors/error_mailer/error_occurred.text.erb
diff --git a/app/views/solid_errors/occurrences/_occurrence.html.erb b/app/views/solid_errors/occurrences/_occurrence.html.erb
@@ -27,9 +27,13 @@
             <% backtrace.lines.each_with_index do |line, i| %>
               <%= tag.details open: line.application? || i.zero? do %>
                 <summary class="hover:bg-gray-50 px-2 py-1 rounded cursor-pointer">
-                  <span class="text-gray-500"><%= File.dirname(line.filtered_file) %>/</span><span class="text-blue-500 font-medium"><%= File.basename(line.filtered_file) %></span>:<span class="text-gray-900 font-medium"><%= line.filtered_number %></span>
-                  <span class="text-gray-500">in</span>
-                  <code class="text-green-500 font-medium"><%= line.filtered_method %></code>
+                  <% if line.filtered_file %>
+                    <span class="text-gray-500"><%= File.dirname(line.filtered_file) %>/</span><span class="text-blue-500 font-medium"><%= File.basename(line.filtered_file) %></span>:<span class="text-gray-900 font-medium"><%= line.filtered_number %></span>
+                    <span class="text-gray-500">in</span>
+                    <code class="text-green-500 font-medium"><%= line.filtered_method %></code>
+                  <% else %>
+                    <span class="text-gray-500"><%= line.unparsed_line %>
+                  <% end %>
                 </summary>
                 <div><pre class="flex overflow-auto rounded-b-lg bg-slate-800 p-4 text-sm leading-normal text-white sm:rounded-t-lg"><code class="flex flex-col min-h-full min-w-content px-0"><% line.source.each do |n, code| %>
                   <div class="line"><span class="mr-2 text-right select-none text-gray-600"><%= n %></span><span><%= code %></span></div>