dead_end 1.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1e8a394d94d7d8f70138a9d80d7e660cca8dc06e3d3a5eb9b74334585f284aa
-  data.tar.gz: 75296d7faaf4b117ad45bed40252566ee08752b622b2d90e4afa3be8b4a9b774
+  metadata.gz: c7db29aed59a901a58a0b1ed50873b6f2c17692f7724ffad2736b99694b78ba0
+  data.tar.gz: e1cf2a11fa38af85df30d89a559b0c6e5a74beec2c0add8b6f67dd142d793de1
 SHA512:
-  metadata.gz: f970086da7e3f662d2dabda9a59d89af73d503dc986a9d469d45b83f25184590892e5bdb0a4c174318b2d1bb201f112c81a0a281d0a530feb49dd7f0eb1fb144
-  data.tar.gz: cc85e81a1d996320128d7656c0cea0727f9672060d7d2747e30e77d2aeb59d3549f4dd230835c5042988c53b1252f975c472774eb2ef7f258caebea5cd5eee40
+  metadata.gz: 444cfdfd7df93038d1714729a21a3b7a20f9000e9cf0541521d51a125d00be4968e83bbc8a51bf4c4689e2b99706cf5eb0032a318647ecb3fd4452a343798e7a
+  data.tar.gz: c532b87160ae6231776b72ff68f3c8f940064051e14c27da28fa22a15c1be0060d9b2afd600bb66dd4571cd39b9372b1956782565040a5e159776f9dac9f9e62

data/.circleci/config.yml

@@ -7,15 +7,12 @@ references:
       name: Run test suite
       command: bundle exec rspec spec/
 
-jobs:
-  "ruby-2-5":
-    docker:
-      - image: circleci/ruby:2.5
-    steps:
-      - checkout
-      - ruby/install-deps
-      - <<: *unit
+  lint: &lint
+    run:
+      name: Run linter, fix with `standardrb --fix` locally
+      command: bundle exec standardrb
 
+jobs:
   "ruby-2-6":
     docker:
       - image: circleci/ruby:2.6
@@ -40,11 +37,19 @@ jobs:
       - ruby/install-deps
       - <<: *unit
 
+  "lint":
+    docker:
+      - image: circleci/ruby:3.0
+    steps:
+      - checkout
+      - ruby/install-deps
+      - <<: *lint
+
 workflows:
   version: 2
   build:
     jobs:
-      - "ruby-2-5"
       - "ruby-2-6"
       - "ruby-2-7"
       - "ruby-3-0"
+      - "lint"

data/.standard.yml

@@ -0,0 +1 @@
+ruby_version: 2.6.6

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 ## HEAD (unreleased)
 
+## 1.2.0
+
+- Output improvements via less greedy unmatched kw capture https://github.com/zombocom/dead_end/pull/73
+- Remove NoMethodError patching instead use https://github.com/ruby/error_highlight/ (https://github.com/zombocom/dead_end/pull/71)
+
+## 1.1.7
+
+- Fix sinatra support for `require_relative` (https://github.com/zombocom/dead_end/pull/63)
+
+## 1.1.6
+
+- Consider if syntax error caused an unexpected variable instead of end (https://github.com/zombocom/dead_end/pull/58)
+
+## 1.1.5
+
+- Parse error once and not twice if there's more than one available (https://github.com/zombocom/dead_end/pull/57)
+
 ## 1.1.4
 
 - Avoid including demo gif in built gem (https://github.com/zombocom/dead_end/pull/53)

data/Gemfile

@@ -8,3 +8,4 @@ gemspec
 gem "rake", "~> 12.0"
 gem "rspec", "~> 3.0"
 gem "stackprof"
+gem "standard"

data/Gemfile.lock

@@ -1,13 +1,20 @@
 PATH
   remote: .
   specs:
-    dead_end (1.1.4)
+    dead_end (1.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    ast (2.4.2)
     diff-lcs (1.4.4)
+    parallel (1.21.0)
+    parser (3.0.2.0)
+      ast (~> 2.4.1)
+    rainbow (3.0.0)
     rake (12.3.3)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -21,7 +28,26 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.0)
+    rubocop (1.20.0)
+      parallel (~> 1.10)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.9.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.12.0)
+      parser (>= 3.0.1.1)
+    rubocop-performance (1.11.5)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    ruby-progressbar (1.11.0)
     stackprof (0.2.16)
+    standard (1.3.0)
+      rubocop (= 1.20.0)
+      rubocop-performance (= 1.11.5)
+    unicode-display_width (2.1.0)
 
 PLATFORMS
   ruby
@@ -31,6 +57,7 @@ DEPENDENCIES
   rake (~> 12.0)
   rspec (~> 3.0)
   stackprof
+  standard
 
 BUNDLED WITH
-   2.2.3
+   2.2.27

data/README.md

@@ -81,27 +81,9 @@ end
 
 As well as unmatched `|` and unmatched `}`. These errors can be time consuming to debug because Ruby often only tells you the last line in the file. The command `ruby -wc path/to/file.rb` can narrow it down a little bit, but this library does a better job.
 
-## What other errors does it handle?
-
-In addition to syntax errors, the NoMethodError is annotated to show the line where the error occured, and the surrounding context:
-
-```
-scratch.rb:7:in `call': undefined method `upcase' for nil:NilClass (NoMethodError)
-
-
-  1  class Pet
-  6    def call
-❯ 7      puts "Come here #{@neam.upcase}"
-  8    end
-  9  end
-```
-
 ## Sounds cool, but why isn't this baked into Ruby directly?
 
-I would love to get something like this directly in Ruby, but I first need to prove it's useful. The `did_you_mean` functionality started as a gem that was eventually adopted by a bunch of people and then Ruby core liked it enough that they included it in the source. The goal of this gem is to:
-
-1. Get real world useage and feedback. If we gave you an awful suggestion, let us know! We try to handle lots of cases well, but maybe we could be better.
-2. Prove out demand. If you like this idea, then vote for it by putting it in your Gemfile.
+We are now talking about it https://bugs.ruby-lang.org/issues/18159#change-93682.
 
 ## Artificial Inteligence?
 

data/Rakefile

@@ -5,4 +5,4 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/dead_end.gemspec

@@ -1,17 +1,17 @@
 # frozen_string_literal: true
 
-require_relative 'lib/dead_end/version'
+require_relative "lib/dead_end/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "dead_end"
-  spec.version       = DeadEnd::VERSION
-  spec.authors       = ["schneems"]
-  spec.email         = ["richard.schneeman+foo@gmail.com"]
+  spec.name = "dead_end"
+  spec.version = DeadEnd::VERSION
+  spec.authors = ["schneems"]
+  spec.email = ["richard.schneeman+foo@gmail.com"]
 
-  spec.summary       = %q{Find syntax errors in your source in a snap}
-  spec.description   = %q{When you get an "unexpected end" in your syntax this gem helps you find it}
-  spec.homepage      = "https://github.com/zombocom/dead_end.git"
-  spec.license       = "MIT"
+  spec.summary = "Find syntax errors in your source in a snap"
+  spec.description = 'When you get an "unexpected end" in your syntax this gem helps you find it'
+  spec.homepage = "https://github.com/zombocom/dead_end.git"
+  spec.license = "MIT"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
@@ -19,10 +19,10 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path("..", __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|assets)/}) }
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 end

data/exe/dead_end

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
-require 'pathname'
+require "pathname"
 require "optparse"
-require_relative "../lib/dead_end.rb"
+require_relative "../lib/dead_end"
 
 options = {}
 options[:terminal] = true
@@ -60,7 +60,7 @@ end
 file = Pathname(file)
 options[:record_dir] = "tmp" if ENV["DEBUG"]
 
-$stderr.puts "Record dir: #{options[:record_dir]}"  if options[:record_dir]
+warn "Record dir: #{options[:record_dir]}" if options[:record_dir]
 
 DeadEnd.call(
   source: file.read,

data/lib/dead_end/around_block_scan.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-#
+
 module DeadEnd
   # This class is useful for exploring contents before and after
   # a block
@@ -28,7 +28,7 @@ module DeadEnd
   #
   # To grab the next surrounding indentation use AroundBlockScan#scan_adjacent_indent
   class AroundBlockScan
-    def initialize(code_lines: , block:)
+    def initialize(code_lines:, block:)
       @code_lines = code_lines
       @orig_before_index = block.lines.first.index
       @orig_after_index = block.lines.last.index
@@ -56,7 +56,7 @@ module DeadEnd
       end_count = 0
       @before_index = before_lines.reverse_each.take_while do |line|
         next false if stop_next
-        next true if @skip_array.detect {|meth| line.send(meth) }
+        next true if @skip_array.detect { |meth| line.send(meth) }
 
         kw_count += 1 if line.is_kw?
         end_count += 1 if line.is_end?
@@ -65,14 +65,14 @@ module DeadEnd
         end
 
         block.call(line)
-      end.reverse.first&.index
+      end.last&.index
 
       stop_next = false
       kw_count = 0
       end_count = 0
       @after_index = after_lines.take_while do |line|
         next false if stop_next
-        next true if @skip_array.detect {|meth| line.send(meth) }
+        next true if @skip_array.detect { |meth| line.send(meth) }
 
         kw_count += 1 if line.is_kw?
         end_count += 1 if line.is_end?
@@ -89,7 +89,7 @@ module DeadEnd
       lines = []
       kw_count = 0
       end_count = 0
-      before_lines.reverse.each do |line|
+      before_lines.reverse_each do |line|
         next if line.empty?
         break if line.indent < @orig_indent
         next if line.indent != @orig_indent
@@ -124,14 +124,14 @@ module DeadEnd
 
         lines << line
       end
-      lines.select! {|line| !line.is_comment? }
+      lines.select! { |line| !line.is_comment? }
 
       lines
     end
 
     def on_falling_indent
       last_indent = @orig_indent
-      before_lines.reverse.each do |line|
+      before_lines.reverse_each do |line|
         next if line.empty?
         if line.indent < last_indent
           yield line
@@ -150,7 +150,7 @@ module DeadEnd
     end
 
     def scan_neighbors
-      self.scan_while {|line| line.not_empty? && line.indent >= @orig_indent }
+      scan_while { |line| line.not_empty? && line.indent >= @orig_indent }
     end
 
     def next_up
@@ -167,13 +167,14 @@ module DeadEnd
       before_after_indent << (next_down&.indent || 0)
 
       indent = before_after_indent.min
-      self.scan_while {|line| line.not_empty? && line.indent >= indent }
+      scan_while { |line| line.not_empty? && line.indent >= indent }
 
       self
     end
 
     def start_at_next_line
-      before_index; after_index
+      before_index
+      after_index
       @before_index -= 1
       @after_index += 1
       self
@@ -196,7 +197,7 @@ module DeadEnd
     end
 
     private def after_lines
-      @code_lines[after_index.next..-1] || []
+      @code_lines[after_index.next..] || []
     end
   end
 end

data/lib/dead_end/auto.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-#
+
 require_relative "../dead_end/internals"
 
 # Monkey patch kernel to ensure that all `require` calls call the same
@@ -27,7 +27,7 @@ module Kernel
     if Pathname.new(file).absolute?
       dead_end_original_require file
     else
-      dead_end_original_require File.expand_path("../#{file}", caller_locations(1, 1)[0].absolute_path)
+      dead_end_original_require File.expand_path("../#{file}", Kernel.caller_locations(1, 1)[0].absolute_path)
     end
   rescue SyntaxError => e
     DeadEnd.handle_error(e)
@@ -40,6 +40,7 @@ end
 # am I doing something different?
 class Object
   private
+
   def load(path, wrap = false)
     Kernel.load(path, wrap)
   rescue SyntaxError => e
@@ -52,53 +53,3 @@ class Object
     DeadEnd.handle_error(e)
   end
 end
-
-module DeadEnd
-  IsProduction = -> {
-    ENV["RAILS_ENV"] == "production" || ENV["RACK_ENV"] == "production"
-  }
-end
-
-# Unlike a syntax error, a NoMethodError can occur hundreds or thousands of times and
-# chew up CPU and other resources. Since this is primarilly a "development" optimization
-# we can attempt to disable this behavior in a production context.
-if !DeadEnd::IsProduction.call
-  class NoMethodError
-    alias :dead_end_original_to_s :to_s
-
-    def to_s
-      return super if DeadEnd::IsProduction.call
-
-      file, line, _ = backtrace[0].split(":")
-      return super if !File.exist?(file)
-
-      index = line.to_i - 1
-      source = File.read(file)
-      code_lines = DeadEnd::CodeLine.parse(source)
-
-      block = DeadEnd::CodeBlock.new(lines: code_lines[index])
-      lines = DeadEnd::CaptureCodeContext.new(
-        blocks: block,
-        code_lines: code_lines
-      ).call
-
-      message = super.dup
-      message << $/
-      message << $/
-
-      message << DeadEnd::DisplayCodeWithLineNumbers.new(
-        lines: lines,
-        highlight_lines: block.lines,
-        terminal: self.class.to_tty?
-      ).call
-
-      message << $/
-      message
-    rescue => e
-      puts "DeadEnd Internal error: #{e.dead_end_original_to_s}"
-      puts "DeadEnd Internal backtrace:"
-      puts backtrace.map {|l| "    " + l }.join($/)
-      super
-    end
-  end
-end

data/lib/dead_end/block_expand.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module DeadEnd
   # This class is responsible for taking a code block that exists
   # at a far indentaion and then iteratively increasing the block
@@ -30,7 +31,7 @@ module DeadEnd
   #      end
   #
   class BlockExpand
-    def initialize(code_lines: )
+    def initialize(code_lines:)
       @code_lines = code_lines
     end
 
@@ -43,7 +44,7 @@ module DeadEnd
     end
 
     def expand_indent(block)
-      block = AroundBlockScan.new(code_lines: @code_lines, block: block)
+      AroundBlockScan.new(code_lines: @code_lines, block: block)
         .skip(:hidden?)
         .stop_after_kw
         .scan_adjacent_indent
@@ -59,15 +60,15 @@ module DeadEnd
       # Slurp up empties
       if grab_empty
         scan = AroundBlockScan.new(code_lines: @code_lines, block: scan.code_block)
-          .scan_while {|line| line.empty? || line.hidden? }
+          .scan_while { |line| line.empty? || line.hidden? }
       end
 
       new_block = scan.code_block
 
       if block.lines == new_block.lines
-        return nil
+        nil
       else
-        return new_block
+        new_block
       end
     end
   end

data/lib/dead_end/capture_code_context.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 module DeadEnd
-
   # Given a block, this method will capture surrounding
   # code to give the user more context for the location of
   # the problem.
@@ -26,7 +25,7 @@ module DeadEnd
   class CaptureCodeContext
     attr_reader :code_lines
 
-    def initialize(blocks: , code_lines:)
+    def initialize(blocks:, code_lines:)
       @blocks = Array(blocks)
       @code_lines = code_lines
       @visible_lines = @blocks.map(&:visible_lines).flatten
@@ -45,13 +44,13 @@ module DeadEnd
       @lines_to_output.uniq!
       @lines_to_output.sort!
 
-      return @lines_to_output
+      @lines_to_output
     end
 
     def capture_falling_indent(block)
       AroundBlockScan.new(
         block: block,
-        code_lines: @code_lines,
+        code_lines: @code_lines
       ).on_falling_indent do |line|
         @lines_to_output << line
       end
@@ -67,50 +66,61 @@ module DeadEnd
       @lines_to_output.concat(around_lines)
     end
 
-    # Problems heredocs are back in play
+    # When there is an invalid with a keyword
+    # right before an end, it's unclear where
+    # the correct code should be.
+    #
+    # Take this example:
+    #
+    #   class Dog       # 1
+    #     def bark      # 2
+    #       puts "woof" # 3
+    #   end             # 4
+    #
+    # However due to https://github.com/zombocom/dead_end/issues/32
+    # the problem line will be identified as:
+    #
+    #  ❯ class Dog       # 1
+    #
+    # Because lines 2, 3, and 4 are technically valid code and are expanded
+    # first, deemed valid, and hidden. We need to un-hide the matching end
+    # line 4. Also work backwards and if there's a mis-matched keyword, show it
+    # too
     def capture_last_end_same_indent(block)
       start_index = block.visible_lines.first.index
       lines = @code_lines[start_index..block.lines.last.index]
-      kw_end_lines = lines.select {|line| line.indent == block.current_indent && (line.is_end? || line.is_kw?) }
-
 
-      # TODO handle case of heredocs showing up here
+      # Find first end with same indent
+      # (this would return line 4)
       #
-      # Due to https://github.com/zombocom/dead_end/issues/32
-      # There's a special case where a keyword right before the last
-      # end of a valid block accidentally ends up identifying that the problem
-      # was with the block instead of before it. To handle that
-      # special case, we can re-parse back through the internals of blocks
-      # and if they have mis-matched keywords and ends show the last one
-      end_lines = kw_end_lines.select(&:is_end?)
-      end_lines.each_with_index  do |end_line, i|
-        start_index = i.zero? ? 0 : end_lines[i-1].index
-        end_index = end_line.index - 1
-        lines = @code_lines[start_index..end_index]
-
-        stop_next = false
-        kw_count = 0
-        end_count = 0
-        lines = lines.reverse.take_while do |line|
-          next false if stop_next
-
-          end_count += 1 if line.is_end?
-          kw_count += 1 if line.is_kw?
+      #   end             # 4
+      matching_end = lines.find { |line| line.indent == block.current_indent && line.is_end? }
+      return unless matching_end
 
-          stop_next = true if !kw_count.zero? && kw_count >= end_count
-          true
-        end.reverse
+      @lines_to_output << matching_end
 
-        next unless kw_count > end_count
+      lines = @code_lines[start_index..matching_end.index]
 
-        lines = lines.select {|line| line.is_kw? || line.is_end? }
-
-        next if lines.empty?
-
-        @lines_to_output << end_line
-        @lines_to_output << lines.first
-        @lines_to_output << lines.last
+      # Work backwards from the end to
+      # see if there are mis-matched
+      # keyword/end pairs
+      #
+      # Return the first mis-matched keyword
+      # this would find line 2
+      #
+      #     def bark      # 2
+      #       puts "woof" # 3
+      #   end             # 4
+      end_count = 0
+      kw_count = 0
+      kw_line = lines.reverse.detect do |line|
+        end_count += 1 if line.is_end?
+        kw_count += 1 if line.is_kw?
+
+        !kw_count.zero? && kw_count >= end_count
       end
+      return unless kw_line
+      @lines_to_output << kw_line
     end
   end
 end

data/lib/dead_end/code_block.rb

@@ -54,11 +54,11 @@ module DeadEnd
     # populate an array with multiple code blocks then call `sort!`
     # on it without having to specify the sorting criteria
     def <=>(other)
-      out = self.current_indent <=> other.current_indent
+      out = current_indent <=> other.current_indent
       return out if out != 0
 
       # Stable sort
-      self.starts_at <=> other.starts_at
+      starts_at <=> other.starts_at
     end
 
     def current_indent
@@ -71,7 +71,7 @@ module DeadEnd
 
     def valid?
       return @valid if @valid != UNSET
-      @valid = DeadEnd.valid?(self.to_s)
+      @valid = DeadEnd.valid?(to_s)
     end
 
     def to_s

data/lib/dead_end/code_frontier.rb

@@ -39,7 +39,7 @@ module DeadEnd
   #
   #   CodeFrontier#detect_invalid_blocks
   class CodeFrontier
-    def initialize(code_lines: )
+    def initialize(code_lines:)
       @code_lines = code_lines
       @frontier = []
       @unvisited_lines = @code_lines.sort_by(&:indent_index)
@@ -66,7 +66,7 @@ module DeadEnd
 
     # Returns a code block with the largest indentation possible
     def pop
-      return @frontier.pop
+      @frontier.pop
     end
 
     def next_indent_line
@@ -78,7 +78,7 @@ module DeadEnd
       return true if @unvisited_lines.empty?
 
       frontier_indent = @frontier.last.current_indent
-      unvisited_indent= next_indent_line.indent
+      unvisited_indent = next_indent_line.indent
 
       if ENV["DEBUG"]
         puts "```"
@@ -106,7 +106,7 @@ module DeadEnd
       register_indent_block(block)
 
       # Make sure we don't double expand, if a code block fully engulfs another code block, keep the bigger one
-      @frontier.reject! {|b|
+      @frontier.reject! { |b|
         b.starts_at >= block.starts_at && b.ends_at <= block.ends_at
       }
       @frontier << block

data/lib/dead_end/code_line.rb

@@ -39,7 +39,7 @@ module DeadEnd
 
     attr_reader :line, :index, :indent, :original_line
 
-    def initialize(line: , index:)
+    def initialize(line:, index:)
       @original_line = line.freeze
       @line = @original_line
       if line.strip.empty?
@@ -64,25 +64,25 @@ module DeadEnd
         next unless lex.type == :on_kw
 
         case lex.token
-        when 'if', 'unless', 'while', 'until'
+        when "if", "unless", "while", "until"
           # Only count if/unless when it's not a "trailing" if/unless
           # https://github.com/ruby/ruby/blob/06b44f819eb7b5ede1ff69cecb25682b56a1d60c/lib/irb/ruby-lex.rb#L374-L375
-          kw_count += 1 if !lex.expr_label?
-        when 'def', 'case', 'for', 'begin', 'class', 'module', 'do'
+          kw_count += 1 unless lex.expr_label?
+        when "def", "case", "for", "begin", "class", "module", "do"
           kw_count += 1
-        when 'end'
+        when "end"
           end_count += 1
         end
       end
 
-      @is_comment = lex_array.detect {|lex| lex.type != :on_sp}&.type == :on_comment
+      @is_comment = lex_array.detect { |lex| lex.type != :on_sp }&.type == :on_comment
       return if @is_comment
       @is_kw = (kw_count - end_count) > 0
       @is_end = (end_count - kw_count) > 0
       @is_trailing_slash = lex_array.last.token == TRAILING_SLASH
     end
 
-    alias :original :original_line
+    alias_method :original, :original_line
 
     def trailing_slash?
       @is_trailing_slash
@@ -92,8 +92,8 @@ module DeadEnd
       @indent_index ||= [indent, index]
     end
 
-    def <=>(b)
-      self.index <=> b.index
+    def <=>(other)
+      index <=> other.index
     end
 
     def is_comment?
@@ -133,7 +133,7 @@ module DeadEnd
     def line_number
       index + 1
     end
-    alias :number :line_number
+    alias_method :number, :line_number
 
     def not_empty?
       !empty?
@@ -144,7 +144,7 @@ module DeadEnd
     end
 
     def to_s
-      self.line
+      line
     end
   end
 end

data/lib/dead_end/code_search.rb

@@ -25,14 +25,21 @@ module DeadEnd
   #   # => ["def lol\n"]
   #
   class CodeSearch
-    private; attr_reader :frontier; public
-    public; attr_reader :invalid_blocks, :record_dir, :code_lines
+    private
+
+    attr_reader :frontier
+
+    public
+
+    public
+
+    attr_reader :invalid_blocks, :record_dir, :code_lines
 
     def initialize(source, record_dir: ENV["DEAD_END_RECORD_DIR"] || ENV["DEBUG"] ? "tmp" : nil)
       @source = source
       if record_dir
-        @time = Time.now.strftime('%Y-%m-%d-%H-%M-%s-%N')
-        @record_dir = Pathname(record_dir).join(@time).tap {|p| p.mkpath }
+        @time = Time.now.strftime("%Y-%m-%d-%H-%M-%s-%N")
+        @record_dir = Pathname(record_dir).join(@time).tap { |p| p.mkpath }
         @write_count = 0
       end
       code_lines = source.lines.map.with_index do |line, i|
@@ -43,7 +50,7 @@ module DeadEnd
 
       @frontier = CodeFrontier.new(code_lines: @code_lines)
       @invalid_blocks = []
-      @name_tick = Hash.new {|hash, k| hash[k] = 0 }
+      @name_tick = Hash.new { |hash, k| hash[k] = 0 }
       @tick = 0
       @block_expand = BlockExpand.new(code_lines: code_lines)
       @parse_blocks_from_indent_line = ParseBlocksFromIndentLine.new(code_lines: @code_lines)
@@ -51,13 +58,13 @@ module DeadEnd
 
     # Used for debugging
     def record(block:, name: "record")
-      return if !@record_dir
+      return unless @record_dir
       @name_tick[name] += 1
       filename = "#{@write_count += 1}-#{name}-#{@name_tick[name]}.txt"
       if ENV["DEBUG"]
         puts "\n\n==== #{filename} ===="
         puts "\n```#{block.starts_at}:#{block.ends_at}"
-        puts "#{block.to_s}"
+        puts block.to_s
         puts "```"
         puts "  block indent:     #{block.current_indent}"
       end
@@ -65,25 +72,21 @@ module DeadEnd
         display = DisplayInvalidBlocks.new(
           blocks: block,
           terminal: false,
-          code_lines: @code_lines,
+          code_lines: @code_lines
         )
-        f.write(display.indent display.code_with_lines)
+        f.write(display.indent(display.code_with_lines))
       end
     end
 
-    def push(block, name: )
+    def push(block, name:)
       record(block: block, name: name)
 
-      if block.valid?
-        block.mark_invisible
-        frontier << block
-      else
-        frontier << block
-      end
+      block.mark_invisible if block.valid?
+      frontier << block
     end
 
     # Removes the block without putting it back in the frontier
-    def sweep(block:, name: )
+    def sweep(block:, name:)
       record(block: block, name: name)
 
       block.lines.each(&:mark_invisible)
@@ -149,8 +152,8 @@ module DeadEnd
         end
       end
 
-      @invalid_blocks.concat(frontier.detect_invalid_blocks )
-      @invalid_blocks.sort_by! {|block| block.starts_at }
+      @invalid_blocks.concat(frontier.detect_invalid_blocks)
+      @invalid_blocks.sort_by! { |block| block.starts_at }
       self
     end
   end

data/lib/dead_end/display_code_with_line_numbers.rb

@@ -23,10 +23,10 @@ module DeadEnd
     TERMINAL_HIGHLIGHT = "\e[1;3m" # Bold, italics
     TERMINAL_END = "\e[0m"
 
-    def initialize(lines: , highlight_lines: [], terminal: false)
+    def initialize(lines:, highlight_lines: [], terminal: false)
       @lines = Array(lines).sort
       @terminal = terminal
-      @highlight_line_hash = Array(highlight_lines).each_with_object({}) {|line, h| h[line] = true  }
+      @highlight_line_hash = Array(highlight_lines).each_with_object({}) { |line, h| h[line] = true }
       @digit_count = @lines.last&.line_number.to_s.length
     end
 
@@ -48,12 +48,12 @@ module DeadEnd
       end.join
     end
 
-    private def format(contents: , number: , highlight: false, empty:)
-      string = String.new("")
-      if highlight
-        string << "❯ "
+    private def format(contents:, number:, empty:, highlight: false)
+      string = +""
+      string << if highlight
+        "❯ "
       else
-        string << "  "
+        "  "
       end
 
       string << number.rjust(@digit_count).to_s

data/lib/dead_end/display_invalid_blocks.rb

@@ -8,7 +8,7 @@ module DeadEnd
   class DisplayInvalidBlocks
     attr_reader :filename
 
-    def initialize(code_lines: ,blocks:, io: $stderr, filename: nil, terminal: false, invalid_obj: WhoDisSyntaxError::Null.new)
+    def initialize(code_lines:, blocks:, io: $stderr, filename: nil, terminal: false, invalid_obj: WhoDisSyntaxError::Null.new)
       @terminal = terminal
       @filename = filename
       @io = io
@@ -78,22 +78,21 @@ module DeadEnd
           <<~EOM
             DeadEnd: Unmatched `}` character detected
 
-            This code has an unmatched `}`. Ensure that opening curl braces are
+            This code has an unmatched `}`. Ensure that opening curly braces are
             closed: `{ }`.
           EOM
         else
-          "DeadEnd: Unmatched #{@invalid_obj.unmatched_symbol}` detected"
+          "DeadEnd: Unmatched `#{@invalid_obj.unmatched_symbol}` detected"
         end
       end
-
     end
 
     def indent(string, with: "    ")
-      string.each_line.map {|l| with  + l }.join
+      string.each_line.map { |l| with + l }.join
     end
 
     def code_block
-      string = String.new("")
+      string = +""
       string << code_with_context
       string
     end
@@ -107,7 +106,7 @@ module DeadEnd
       DisplayCodeWithLineNumbers.new(
         lines: lines,
         terminal: @terminal,
-        highlight_lines: @invalid_lines,
+        highlight_lines: @invalid_lines
       ).call
     end
 
@@ -115,7 +114,7 @@ module DeadEnd
       DisplayCodeWithLineNumbers.new(
         lines: @code_lines.select(&:visible?),
         terminal: @terminal,
-        highlight_lines: @invalid_lines,
+        highlight_lines: @invalid_lines
       ).call
     end
   end

data/lib/dead_end/fyi.rb

@@ -1,7 +1,6 @@
 require_relative "../dead_end/internals"
 
-require_relative "auto.rb"
+require_relative "auto"
 
 DeadEnd.send(:remove_const, :SEARCH_SOURCE_ON_ERROR_DEFAULT)
 DeadEnd::SEARCH_SOURCE_ON_ERROR_DEFAULT = false
-

data/lib/dead_end/heredoc_block_parse.rb

@@ -3,9 +3,13 @@
 module DeadEnd
   # Takes in a source, and returns blocks containing each heredoc
   class HeredocBlockParse
-    private; attr_reader :code_lines, :lex; public
+    private
 
-    def initialize(source:, code_lines: )
+    attr_reader :code_lines, :lex
+
+    public
+
+    def initialize(source:, code_lines:)
       @code_lines = code_lines
       @lex = LexAll.new(source: source)
     end

data/lib/dead_end/internals.rb

@@ -1,15 +1,16 @@
 # frozen_string_literal: true
+
 #
 # This is the top level file, but is moved to `internals`
 # so the top level file can instead enable the "automatic" behavior
 
 require_relative "version"
 
-require 'tmpdir'
-require 'stringio'
-require 'pathname'
-require 'ripper'
-require 'timeout'
+require "tmpdir"
+require "stringio"
+require "pathname"
+require "ripper"
+require "timeout"
 
 module DeadEnd
   class Error < StandardError; end
@@ -17,27 +18,27 @@ module DeadEnd
   TIMEOUT_DEFAULT = ENV.fetch("DEAD_END_TIMEOUT", 5).to_i
 
   def self.handle_error(e, search_source_on_error: SEARCH_SOURCE_ON_ERROR_DEFAULT)
-    raise e if !e.message.include?("end-of-input")
+    raise e unless e.message.include?("end-of-input")
 
     filename = e.message.split(":").first
 
     $stderr.sync = true
-    $stderr.puts "Run `$ dead_end #{filename}` for more options\n"
+    warn "Run `$ dead_end #{filename}` for more options\n"
 
     if search_source_on_error
-      self.call(
+      call(
         source: Pathname(filename).read,
         filename: filename,
-        terminal: true,
+        terminal: true
       )
     end
 
-    $stderr.puts ""
-    $stderr.puts ""
+    warn ""
+    warn ""
     raise e
   end
 
-  def self.call(source: , filename: , terminal: false, record_dir: nil, timeout: TIMEOUT_DEFAULT, io: $stderr)
+  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
@@ -82,13 +83,13 @@ module DeadEnd
   #   )                                    # => true
   #
   #   DeadEnd.valid?(code_lines) # => false
-  def self.valid_without?(without_lines: , code_lines:)
+  def self.valid_without?(without_lines:, code_lines:)
     lines = code_lines - Array(without_lines).flatten
 
     if lines.empty?
-      return true
+      true
     else
-      return valid?(lines)
+      valid?(lines)
     end
   end
 
@@ -137,7 +138,6 @@ module DeadEnd
     !invalid?(source)
   end
 
-
   def self.invalid_type(source)
     WhoDisSyntaxError.new(source).call
   end

data/lib/dead_end/lex_all.rb

@@ -8,20 +8,20 @@ module DeadEnd
   class LexAll
     include Enumerable
 
-    def initialize(source: )
+    def initialize(source:)
       @lex = Ripper.lex(source)
-      lineno = @lex.last&.first&.first + 1
+      lineno = @lex.last.first.first + 1
       source_lines = source.lines
       last_lineno = source_lines.count
 
       until lineno >= last_lineno
-        lines = source_lines[lineno..-1]
+        lines = source_lines[lineno..]
 
-        @lex.concat(Ripper.lex(lines.join, '-', lineno + 1))
-        lineno = @lex.last&.first&.first + 1
+        @lex.concat(Ripper.lex(lines.join, "-", lineno + 1))
+        lineno = @lex.last.first.first + 1
       end
 
-      @lex.map! {|(line, _), type, token, state| LexValue.new(line, _, type, token, state) }
+      @lex.map! { |(line, _), type, token, state| LexValue.new(line, type, token, state) }
     end
 
     def each
@@ -49,7 +49,7 @@ module DeadEnd
     class LexValue
       attr_reader :line, :type, :token, :state
 
-      def initialize(line, _, type, token, state)
+      def initialize(line, type, token, state)
         @line = line
         @type = type
         @token = token

data/lib/dead_end/parse_blocks_from_indent_line.rb

@@ -29,7 +29,7 @@ module DeadEnd
   class ParseBlocksFromIndentLine
     attr_reader :code_lines
 
-    def initialize(code_lines: )
+    def initialize(code_lines:)
       @code_lines = code_lines
     end
 
@@ -38,7 +38,7 @@ module DeadEnd
       scan = AroundBlockScan.new(code_lines: code_lines, block: CodeBlock.new(lines: target_line))
         .skip(:empty?)
         .skip(:hidden?)
-        .scan_while {|line| line.indent >= target_line.indent }
+        .scan_while { |line| line.indent >= target_line.indent }
 
       neighbors = scan.code_block.lines
 
@@ -53,4 +53,3 @@ module DeadEnd
     end
   end
 end
-

data/lib/dead_end/trailing_slash_join.rb

@@ -27,7 +27,7 @@ module DeadEnd
       @trailing_lines = []
       @code_lines.select(&:trailing_slash?).each do |trailing|
         stop_next = false
-        lines = @code_lines[trailing.index..-1].take_while do |line|
+        lines = @code_lines[trailing.index..].take_while do |line|
           next false if stop_next
 
           if !line.trailing_slash?
@@ -47,7 +47,7 @@ module DeadEnd
         lines.each(&:mark_invisible)
       end
 
-      return @code_lines_dup
+      @code_lines_dup
     end
   end
 end

data/lib/dead_end/version.rb

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

data/lib/dead_end/who_dis_syntax_error.rb

@@ -9,8 +9,13 @@ module DeadEnd
   #   # => :missing_end
   class WhoDisSyntaxError < Ripper
     class Null
-      def error_symbol; :missing_end; end
-      def unmatched_symbol; :end ; end
+      def error_symbol
+        :missing_end
+      end
+
+      def unmatched_symbol
+        :end
+      end
     end
     attr_reader :error, :run_once
 
@@ -42,22 +47,25 @@ module DeadEnd
     end
 
     def on_parse_error(msg)
+      return if @error_symbol && @unmatched_symbol
+
       @error = msg
       @unmatched_symbol = :unknown
 
-      if @error.match?(/unexpected end-of-input/)
+      case @error
+      when /unexpected end-of-input/
         @error_symbol = :missing_end
-      elsif @error.match?(/expecting end-of-input/)
-        @error_symbol = :unmatched_syntax
+      when /expecting end-of-input/
         @unmatched_symbol = :end
-      elsif @error.match?(/unexpected `end'/) ||  # Ruby 2.7 & 3.0
-          @error.match?(/unexpected end,/) ||     # Ruby 2.6
-          @error.match?(/unexpected keyword_end/) # Ruby 2.5
-
         @error_symbol = :unmatched_syntax
+      when /unexpected .* expecting '(?<unmatched_symbol>.*)'/
+        @unmatched_symbol = $1.to_sym if $1
+        @error_symbol = :unmatched_syntax
+      when /unexpected `end'/, # Ruby 2.7 and 3.0
+           /unexpected end/, # Ruby 2.6
+           /unexpected keyword_end/i # Ruby 2.5
 
-        match = @error.match(/expecting '(?<unmatched_symbol>.*)'/)
-        @unmatched_symbol = match[:unmatched_symbol].to_sym if match
+        @error_symbol = :unmatched_syntax
       else
         @error_symbol = :unknown
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dead_end
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
 platform: ruby
 authors:
 - schneems
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-26 00:00:00.000000000 Z
+date: 2021-10-08 00:00:00.000000000 Z
 dependencies: []
 description: When you get an "unexpected end" in your syntax this gem helps you find
   it
@@ -23,7 +23,7 @@ files:
 - ".github/workflows/check_changelog.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- ".standard.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Find syntax errors in your source in a snap

data/.travis.yml

@@ -1,6 +0,0 @@
----
-language: ruby
-cache: bundler
-rvm:
-  - 2.7.2
-before_install: gem install bundler -v 2.1.4