dead_end 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f04f0b2618c6787e30d722b387fe19eb026923d588abf15d676566a3496970f7
-  data.tar.gz: 9ea352efa6c3622eb9097a33f79db08219e4d156ea5ccbcfab3777e8e176472e
+  metadata.gz: 91a09272a46d3519c0ca78dcd3fd38199898fea1d6261c18576ff832e55351bd
+  data.tar.gz: f50e76a749fe0ecdf871fdaf6aead25132cb26a5d03068cbc611476c6eb06a8c
 SHA512:
-  metadata.gz: 1dd513cdeba2f2e560eacd2113660e77f3eea9c0f0947629fe5c0e7352d2fcbf2178107fead38d7e7a32ead25e803b324809863af151eff70fb9831ffd43c8ec
-  data.tar.gz: e377f56853a8fd6e72afd9bb262965876dfa0242158a7a7327523825a3e1c008173bf1c2d6b1bf25b5a79c51711326e6cae098cfe4b363407929ccbf7ae8ad78
+  metadata.gz: 89e7c7734a7a74c735479d35418ffda7d53557ce7d0c8a47fb2a67f5581d87d1be8117ff62d6590ed2cbf633fb566b797a6f3c3033e6c6a50b543cfbba9f4718
+  data.tar.gz: 2804e68394e928f36803859eb0e193bf96dc088138c4fea87510d6bc0d70e9c5485b6ca4c402762174c1ba3b139b9a4d1af28a6b31e87ec4e36859f659afc42d

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## HEAD (unreleased)
 
+## 1.0.1
+
+- Fix performance issue when evaluating multiple block combinations (https://github.com/zombocom/dead_end/pull/35)
+
 ## 1.0.0
 
 - Gem name changed from `syntax_search` to `dead_end` (https://github.com/zombocom/syntax_search/pull/30)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dead_end (1.0.0)
+    dead_end (1.0.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/dead_end/around_block_scan.rb

@@ -153,11 +153,20 @@ module DeadEnd
       self.scan_while {|line| line.not_empty? && line.indent >= @orig_indent }
     end
 
+    def next_up
+      @code_lines[before_index.pred]
+    end
+
+    def next_down
+      @code_lines[after_index.next]
+    end
+
     def scan_adjacent_indent
-      before_indent = @code_lines[@orig_before_index.pred]&.indent || 0
-      after_indent = @code_lines[@orig_after_index.next]&.indent || 0
+      before_after_indent = []
+      before_after_indent << next_up&.indent || 0
+      before_after_indent << next_down&.indent || 0
 
-      indent = [before_indent, after_indent].min
+      indent = before_after_indent.min
       self.scan_while {|line| line.not_empty? && line.indent >= indent }
 
       self
@@ -183,11 +192,11 @@ module DeadEnd
     end
 
     private def before_lines
-      @code_lines[0...@orig_before_index]
+      @code_lines[0...@orig_before_index] || []
     end
 
     private def after_lines
-      @code_lines[@orig_after_index.next..-1]
+      @code_lines[after_index.next..-1] || []
     end
   end
 end

data/lib/dead_end/code_frontier.rb

@@ -143,7 +143,7 @@ module DeadEnd
     # Given that we know our syntax error exists somewhere in our frontier, we want to find
     # the smallest possible set of blocks that contain all the syntax errors
     def detect_invalid_blocks
-      self.class.combination(@frontier).detect do |block_array|
+      self.class.combination(@frontier.select(&:invalid?)).detect do |block_array|
         holds_all_syntax_errors?(block_array)
       end || []
     end

data/lib/dead_end/internals.rb

@@ -37,9 +37,10 @@ module DeadEnd
     raise e
   end
 
-  def self.call(source: , filename: , terminal: false, record_dir: nil, timeout: TIMEOUT_DEFAULT)
+  def self.call(source: , filename: , terminal: false, record_dir: nil, timeout: TIMEOUT_DEFAULT, io: $stderr)
     search = nil
     Timeout.timeout(timeout) do
+      record_dir ||= ENV["DEBUG"] ? "tmp" : nil
       search = CodeSearch.new(source, record_dir: record_dir).call
     end
 
@@ -50,10 +51,11 @@ module DeadEnd
       terminal: terminal,
       code_lines: search.code_lines,
       invalid_obj: invalid_type(source),
-      io: $stderr
+      io: io
     ).call
-  rescue Timeout::Error
-    $stderr.puts "Search timed out DEAD_END_TIMEOUT=#{timeout}, run with DEBUG=1 for more info"
+  rescue Timeout::Error => e
+    io.puts "Search timed out DEAD_END_TIMEOUT=#{timeout}, run with DEBUG=1 for more info"
+    io.puts e.backtrace.first(3).join($/)
   end
 
   # Used for counting spaces

data/lib/dead_end/parse_blocks_from_indent_line.rb

@@ -40,7 +40,7 @@ module DeadEnd
         .skip(:hidden?)
         .scan_while {|line| line.indent >= target_line.indent }
 
-      neighbors = @code_lines[scan.before_index..scan.after_index]
+      neighbors = scan.code_block.lines
 
       until neighbors.empty?
         lines = [neighbors.pop]

data/lib/dead_end/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DeadEnd
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dead_end
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - schneems
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-10 00:00:00.000000000 Z
+date: 2020-12-11 00:00:00.000000000 Z
 dependencies: []
 description: When you get an "unexpected end" in your syntax this gem helps you find
   it
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: Find syntax errors in your source in a snap