klenod-runtime 0.0.25 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a97cfa8ffe99cf3ca9b6945dd5ffb00651033260a351bd410f15c5a27ff9914
-  data.tar.gz: 241211ea238eef38293d64dfd153df4ee10e0e67f57159c6902d5d6f61a77dfd
+  metadata.gz: b6f0c91d7317fbce5a7fb31ca1053250d8948a1d79c651cc326c60d4e8320e48
+  data.tar.gz: 64a1db410a43c214bdd5d890d08edb43349d0a25735e497dd2d38892f29b1b7d
 SHA512:
-  metadata.gz: a5084b92b42713e06965b08fed7e53880fc8309e0a9705556a0a7b7c36a9bb587ab4694cbe1568ab9e48e6f908c0525edd884879854411e79de032a167ff89d1
-  data.tar.gz: 0ae0cc9c9c99aa5df9dc6e049fe699d4b6469cae2aad0ee2784a18c1926aa79a34d33bb766d4874d0b95edd5f0556b669985c7f047d35eea49a15a2502811492
+  metadata.gz: f8d93b47b5c8ff28e4be3818962129f505a6b889fa8555f8aa1592dc1089bf40388311c6c984d302afc79769617da996f2141e399c4d8e60ef4db993f6f57b9e
+  data.tar.gz: 4f9eaf10ab9690a834eeaa42eb7f5e3508635ef05fd942e3af987cf1ed539c48916958608cdfd9b4782f65642f05981e153abb9f78a5e5a7487bc5a73e7b0243

data/lib/klenod/runtime/backtrace_rewriter.rb

@@ -44,31 +44,6 @@ module Klenod
         @constant_display_names = constant_display_names_for(mods)
       end
 
-      def format_exception(e, source_path: nil)
-        reset = "\e[0;48;5;52m"
-        rewrite_exception(e)
-        sources = format_sources(e.backtrace)
-
-        [
-          "\e[1;31;47m ERROR \e[3;31;47m #{e.class.name}: #{e.message} #{reset}",
-          "\e[1;34mBacktrace:#{reset}",
-          e
-            .backtrace
-            .map do |line|
-              if line in BacktraceString
-                format(
-                  "#{reset}\e[2mfrom #{reset}\e[1m%<file>s:%<line>d#{reset}\e[2m:in '#{reset}\e[1m%<description>s#{reset}\e[2m'#{reset}",
-                  line.parsed_backtrace_entry.to_h
-                )
-              else
-                "from #{line}"
-              end
-            end
-            .join("\n"),
-          formatted_sources(sources, reset)
-        ].compact.join("\n") + "\e[0m"
-      end
-
       def rewrite_exception(e)
         rewrite_exception_message(e)
         e.set_backtrace(rewrite_backtrace(e.backtrace))
@@ -84,21 +59,14 @@ module Klenod
         end
       end
 
-      private
-
-      def formatted_sources(sources, reset)
-        return nil if sources.empty?
-
-        [
-          "\e[1;34mSources:#{reset}",
-          sources
-            .map do |file, formatted_source|
-              "\e[1m#{file}\e[0m\n#{formatted_source}"
-            end
-            .join("\n")
-        ].join("\n")
+      # The original source of the module evaluated from `file`, for tools
+      # that show an excerpt next to a frame.
+      def source_for(file)
+        @source_map_cache[file]&.input
       end
 
+      private
+
       def source_maps_for(mods)
         mods.each_with_object({}) do |(key, mod), index|
           next unless mod.respond_to?(:source_map)
@@ -148,56 +116,6 @@ module Klenod
       def find_original_line_no(file, line_no)
         @source_map_cache[file]&.find_original_line_no(line_no)
       end
-
-      def format_sources(backtrace)
-        backtrace
-          .select { |line| line.is_a?(BacktraceString) }
-          .map(&:parsed_backtrace_entry)
-          .group_by(&:file)
-          .map do |file, entries|
-            if (source_map = @source_map_cache[file])
-              [file, format_source(source_map.input, entries.map(&:line))]
-            end
-          end
-          .compact
-          .to_h
-      end
-
-      def format_source(source, interesting_lines)
-        ranges =
-          merge_overlapping_ranges(interesting_lines.map { (it - 2)..(it + 2) })
-        lines = source.each_line.to_a
-
-        ranges
-          .map do |range|
-            range
-              .map do |i|
-                next if i <= 0
-                line = lines[i - 1]
-                next unless line
-
-                str = format("%3d: %s", i, line.chomp)
-                interesting_lines.include?(i) ? "\e[1;31m#{str}\e[0m" : str
-              end
-              .compact
-              .join("\n")
-          end
-          .join("\n\e[37;44m ... \e[0m\n")
-      end
-
-      def merge_overlapping_ranges(ranges)
-        ranges.each_with_object([]) do |range, merged|
-          if (idx = merged.find_index { |r| r.overlap?(range) })
-            overlapping = merged[idx]
-            merged[idx] = [overlapping.begin, range.begin].min..[
-              overlapping.end,
-              range.end
-            ].max
-          else
-            merged << range
-          end
-        end
-      end
     end
   end
 end

data/lib/klenod/runtime/version.rb

@@ -2,6 +2,6 @@
 
 module Klenod
   module Runtime
-    VERSION = "0.0.25"
+    VERSION = "0.0.26"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: klenod-runtime
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
 platform: ruby
 authors:
 - Andrés Alin