dead_code_terminator 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0594405128f563ed209b13acac45f6d1dcfebb56c36f51bee071cab04e208ecf'
-  data.tar.gz: 3c16615d8ed48a12d1284908a35e580d90c008eb85ec4e7c3aa94a133fe0e775
+  metadata.gz: 30f177ea46b025d82a1647deb392a82ea79bf7d188180b01db1d3b7c9914772f
+  data.tar.gz: a1e654d7c848fea862cf3c3fdbf07e42096457e4994beb76f7b8c0fe6b83580a
 SHA512:
-  metadata.gz: 215e88c2977706899fb2d312b483cd46e8d9311f1cb411f62d9cce8a3d64fce29891ebdaf02497fb9e200efc805830af06104840a9e9da0bdc825f3a2085933b
-  data.tar.gz: aeb91248beb05727ae810e98833a70c19df8e6b34f6641a40d477a3f71773943453cdcf8aa706387002ba04db471acdb33c15afcf234b3a93f6aadac4d845c19
+  metadata.gz: 01d433228fbd4f63be908d7b0841d42514442f6fdf4d5c1ba54c241b4746284a430594d19061eb2a4926c0e7639cdc5694cdf12b16a498f41bb131ce2ff0bdc4
+  data.tar.gz: 4405404ec2c1e561177c7a3780d8b8511fbae3a1545d02231bc5b261845d4eb1925e081f1a1f439d482314785868ee9b2b7dacd8a472e9e9b698f855d13f26b5

data/.rubocop.yml

@@ -26,3 +26,7 @@ Lint/BooleanSymbol:
 Metrics/BlockLength:
   Exclude:
     - spec/**/*rb
+
+Naming/VariableNumber:
+  Exclude:
+    - spec/**/*rb

data/README.md

@@ -27,8 +27,6 @@ So if you have hotfix patches from upstream - they'll be applied without conflic
 
 ## TODO
 
-- `unless`
-- `x ? a : b`
 - builtin file tree processing
 ## License
 

data/lib/dead_code_terminator.rb

@@ -14,6 +14,24 @@ module DeadCodeTerminator
   class Error < StandardError; end
 
   def self.strip(io, env: {})
-    Ast.new(env: env, ast: Unparser.parse(io)).process
+    replaces = on_node(Unparser.parse(io)) do |ast|
+      Ast.new(env: env, ast: ast).process if ast.type == :if
+    end
+
+    rewrite(Parser::Source::Buffer.new("buffer-or-filename", source: io), replaces)
+  end
+
+  def self.rewrite(buffer, replaces)
+    Parser::Source::TreeRewriter.new(buffer).tap do |rewriter|
+      replaces.each do |replace|
+        rewriter.replace(*replace)
+      end
+    end.process
+  end
+
+  def self.on_node(node, &block)
+    Array(yield(node)) + node.children.flat_map do |elem|
+      on_node(elem, &block) if elem.is_a?(Parser::AST::Node)
+    end.compact
   end
 end

data/lib/dead_code_terminator/ast.rb

@@ -2,35 +2,46 @@
 
 module DeadCodeTerminator
   class Ast
-    attr_reader :env, :ast
+    attr_reader :env, :ast, :buf, :cond, :then_branch, :else_branch
 
     def initialize(env:, ast:)
       @env = env
       @ast = ast
+      @buf = @ast.loc.expression.source_buffer
+      @cond, @then_branch, @else_branch = @ast.children
+
+      # handle single brackets around: `if (ENV['X'])`
+      @cond = @cond.children[0] if (@cond.type == :begin) && (@cond.children.size == 1)
     end
 
     def process
-      erase_before!
-      erase_after!
-      rewriter.process
+      static_if_branch ? [erase_before_args, erase_after_args] : []
     end
 
     private
 
-    def erase_before!
-      rewriter.replace(range(end_pos, (total_end - end_pos)), "\n" * (total_lines - to_line))
+    def erase_before_args
+      [range(total_begin, begin_pos_before_spaces), "\n" * (from_line - total_first_line)]
+    end
+
+    def erase_after_args
+      [range(end_pos, total_end), "\n" * (total_lines - to_line)]
     end
 
-    def erase_after!
-      rewriter.replace(range(0, begin_pos), "\n" * (from_line - 1))
+    def begin_pos_before_spaces
+      begin_pos - count_spaces_before_first_line_of_static_if_branch
     end
 
     def begin_pos
-      new_ast.loc.expression.begin_pos
+      static_if_branch.loc.expression.begin_pos
     end
 
     def end_pos
-      new_ast.loc.expression.end_pos
+      static_if_branch.loc.expression.end_pos
+    end
+
+    def total_begin
+      ast.loc.expression.begin_pos
     end
 
     def total_end
@@ -38,47 +49,47 @@ module DeadCodeTerminator
     end
 
     def from_line
-      new_ast.loc.expression.source_buffer.line_for_position(begin_pos)
+      @from_line ||= line_for_position_of_static_if_branch(begin_pos)
     end
 
     def to_line
-      new_ast.loc.expression.source_buffer.line_for_position(end_pos)
+      line_for_position_of_static_if_branch(end_pos)
     end
 
     def total_lines
       ast.loc.last_line
     end
 
-    def rewriter
-      @rewriter ||= Parser::Source::TreeRewriter.new(buf)
+    def total_first_line
+      ast.loc.first_line
     end
 
-    def range(from, len)
-      Parser::Source::Range.new(buf, from, from + len)
+    def range(from, to)
+      Parser::Source::Range.new(buf, from, to)
     end
 
-    def buf
-      @buf ||= ast.loc.expression.source_buffer
+    # :(
+    def count_spaces_before_first_line_of_static_if_branch
+      (begin_pos - 1).downto(0).take_while do |pos|
+        line_for_position_of_static_if_branch(pos) == from_line
+      end.size
     end
 
-    def new_ast
-      @new_ast ||= case ast.type
-                   when :if then if_ast
-                   else ast
-                   end
+    def line_for_position_of_static_if_branch(pos)
+      static_if_branch.loc.expression.source_buffer.line_for_position(pos)
     end
 
-    def if_ast
-      cond, then_branch, else_branch = ast.children
+    def static_if_branch
+      return @static_if_branch if defined? @static_if_branch
 
       Cond.nodes.each do |klass|
         if (value = klass.new(env: env, ast: cond).value)
-          return then_branch if value == Cond::Base::THEN
-          return else_branch if value == Cond::Base::ELSE
+          return (@static_if_branch = then_branch) if value == Cond::Base::THEN
+          return (@static_if_branch = else_branch) if value == Cond::Base::ELSE
         end
       end
 
-      ast
+      @static_if_branch = nil
     end
   end
 end

data/lib/dead_code_terminator/cond/base.rb

@@ -3,6 +3,8 @@
 module DeadCodeTerminator
   module Cond
     class Base
+      include ::AST::Sexp
+
       THEN = :then
       ELSE = :else
 
@@ -14,12 +16,6 @@ module DeadCodeTerminator
       end
 
       def value; end
-
-      private
-
-      def s(type, *children)
-        Parser::AST::Node.new(type, children)
-      end
     end
   end
 end

data/lib/dead_code_terminator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DeadCodeTerminator
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dead_code_terminator
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Vlad Bokov