prettyrb 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '007694f712c84951a00b378847984d9c2d63c11657401cbf162d2990c7390145'
-  data.tar.gz: cd6a21d3898fd52ad7564f4d23232a97190211a8a96c854b56d1cf05c0d34bf6
+  metadata.gz: cfaf933924416b3773afaed63ee03ca8c2ddaa9a3e36147c3db453f24245e375
+  data.tar.gz: b5fcfe41b9738e7bd628501b1aff497e7083cb7f6e061fa7e5821719c7c86bcf
 SHA512:
-  metadata.gz: e7241d399abb72fde4d602824b7e57c8eecf223b4d79b69bac273d975a79ffd970fbd64163d44ac550fdf8c04f8e2b16cc7812a2966abf73dc74a644270a2280
-  data.tar.gz: 15a570f713afaf041661fdb7f04f4098d7cb8093f7fdd36ee9bf568b50fbd0aff39f061f27a5393a5f91d950d573a38d32ab5700de64dcc4455c3aa9a43cf4ad
+  metadata.gz: de542dd1e0f5999aa4aec410a8329e387944e1ce370805c2c4aaa805f5020034287fb7db8e0bfe4d3c2627b722c6b0d3a3cfa0024dbc4255fba9e3161cea0a9f
+  data.tar.gz: 953349398a0107c7012336a3a69dd0ae5c700cde330fced7db07cd96876178cfe87457273fc4440b48caabd2f050b26f79b26e0ec8f2c40af279fe2c3246ab4a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    prettyrb (0.3.0)
+    prettyrb (0.3.1)
       parser (~> 2.7.0.5)
       thor
 
@@ -9,11 +9,15 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.0)
-    byebug (11.1.1)
+    coderay (1.1.2)
     docile (1.3.2)
+    method_source (1.0.0)
     minitest (5.14.0)
     parser (2.7.0.5)
       ast (~> 2.4.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     rake (12.3.3)
     simplecov (0.18.5)
       docile (~> 1.1)
@@ -25,12 +29,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.17)
-  byebug (~> 11.1)
+  bundler (~> 2.1.4)
   minitest (~> 5.0)
   prettyrb!
+  pry (~> 0.13)
   rake (~> 12.3.3)
   simplecov (~> 0.18)
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

data/README.md

@@ -22,12 +22,24 @@ Or install it yourself as:
 
 ## Usage
 
+CLI:
+
+```
+$ prettyrb format FILE
+```
+
+or to re-write the file:
+
+```
+prettyrb format FILE --write
+```
+
+In Ruby code:
+
 ```ruby
 PrettyRb.new(source_code).format
 ```
 
-CLI helper coming soon™
-
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/lib/prettyrb/builder.rb

@@ -0,0 +1,15 @@
+module Prettyrb
+  class Builder < Parser::Builders::Default
+    NODE_TYPES = {
+      if: Prettyrb::Nodes::IfNode,
+      str: Prettyrb::Nodes::StrNode,
+      dstr: Prettyrb::Nodes::DstrNode,
+    }.freeze
+
+    def n(type, children, source_map)
+      node_class = NODE_TYPES.fetch(type, Prettyrb::Nodes::BaseNode)
+
+      node_class.new(type, children, location: source_map)
+    end
+  end
+end

data/lib/prettyrb/cli.rb

@@ -2,10 +2,20 @@ require "thor"
 
 module Prettyrb
   class CLI < Thor
-    desc "format FILE", "file to prettify"
-    def format(file)
+    desc "format [FILE]", "Ruby file to prettify"
+    option :write, type: :boolean
+    method_option :files, type: :array
+    def format(*files)
       content = File.read(file)
-      puts Prettyrb::Formatter.new(content).format
+      formatted_content = Prettyrb::Formatter.new(content).format
+
+      if options[:write]
+        File.open(file, 'w') do |f|
+          f.write(formatted_content)
+        end
+      else
+        puts formatted_content
+      end
     end
   end
 end

data/lib/prettyrb/formatter.rb

@@ -7,10 +7,21 @@ module Prettyrb
     end
 
     def format
-      root_node, _comments = Parser::CurrentRuby.parse_with_comments(@code)
+      parser = Parser::CurrentRuby.new(Prettyrb::Builder.new)
+
+      parser.diagnostics.all_errors_are_fatal = true
+      parser.diagnostics.ignore_warnings      = true
+
+      parser.diagnostics.consumer = lambda do |diagnostic|
+        $stderr.puts(diagnostic.render)
+      end
+
+      root_node, _comments = parser.parse_with_comments(
+        Parser::CurrentRuby.send(:setup_source_buffer, "file='(string)'", 1, @code, parser.default_encoding)
+      )
 
       visitor = Visitor.new
-      visitor.visit(root_node, nil)
+      visitor.visit(root_node)
 
       visitor.output
     end

data/lib/prettyrb/nodes/base_node.rb

@@ -0,0 +1,30 @@
+require "delegate"
+
+module Prettyrb
+  module Nodes
+    class BaseNode < Parser::AST::Node
+      def initialize(type, children, properties)
+        @mutable = {}
+
+        super
+
+        children.each do |child|
+          next unless child.is_a?(BaseNode)
+          child.parent = self
+        end
+
+        self
+      end
+
+      def parent
+        @mutable[:parent]
+      end
+
+      protected
+
+      def parent=(parent)
+        @mutable[:parent] = parent
+      end
+    end
+  end
+end

data/lib/prettyrb/nodes/dstr_node.rb

@@ -0,0 +1,20 @@
+module Prettyrb
+  module Nodes
+    class DstrNode < BaseNode
+      include StringHelper
+
+      HEREDOC_TYPE_REGEX = /<<(.)?/
+
+      def format
+        raw_content = loc.expression.source
+        content = raw_content[1...-1]
+
+        if raw_content[0] == "'"
+          content.gsub('"', '\\"').gsub('#{', '\\#{')
+        else
+          content.gsub("\\", "\\\\")
+        end
+      end
+    end
+  end
+end

data/lib/prettyrb/nodes/if_node.rb

@@ -0,0 +1,47 @@
+module Prettyrb
+  module Nodes
+    class IfNode < BaseNode
+      def if_type
+        if is_elsif?
+          "elsif"
+        elsif unless_node?
+          "unless"
+        else
+          "if"
+        end
+      end
+
+      def conditions_node
+        children[0]
+      end
+
+      def body_node
+        if unless_node?
+          children[2]
+        else
+          children[1]
+        end
+      end
+
+      def else_body_node
+        if unless_node?
+          children[1]
+        else
+          children[2]
+        end
+      end
+
+      def has_elsif?
+        else_body_node&.type == :if && children[1]&.type != :if
+      end
+
+      def is_elsif?
+        parent&.type == :if && parent&.children[1]&.type != :if
+      end
+
+      def unless_node?
+        children[1].nil? && children[2] != :if
+      end
+    end
+  end
+end

data/lib/prettyrb/nodes/str_node.rb

@@ -0,0 +1,18 @@
+module Prettyrb
+  module Nodes
+    class StrNode < BaseNode
+      include StringHelper
+
+      def format
+        raw_content = loc.expression.source
+        content = raw_content[1...-1]
+
+        if raw_content[0] == "'"
+          content.gsub('"', '\\"').gsub('#{', '\\#{')
+        else
+          content.gsub("\\", "\\\\")
+        end
+      end
+    end
+  end
+end

data/lib/prettyrb/nodes/string_helper.rb

@@ -0,0 +1,27 @@
+module Prettyrb
+  module Nodes
+    module StringHelper
+      HEREDOC_TYPE_REGEX = /<<(.)?/
+
+      def heredoc_identifier
+        loc.heredoc_end.source.strip
+      end
+
+      def heredoc_type
+        # Always use indentable ending heredoc type if no type was provided
+        #
+        # eg: <<RUBY becomes <<-RUBY since <<- allows the ending identifier
+        # to be indented
+        loc.expression.source.match(HEREDOC_TYPE_REGEX)[1] || "-"
+      end
+
+      def heredoc_body
+        loc.heredoc_body.source
+      end
+
+      def heredoc?
+        !!loc.respond_to?(:heredoc_body)
+      end
+    end
+  end
+end

data/lib/prettyrb/version.rb

@@ -1,3 +1,3 @@
 module Prettyrb
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/lib/prettyrb/visitor.rb

@@ -104,25 +104,25 @@ module Prettyrb
       @current_line = ''
     end
 
-    def write(input)
+    def write(input, skip_indent: false)
       if @newline
-        @output << indents
-        @current_line << indents
+        @output << indents unless skip_indent
+        @current_line << indents unless skip_indent
       end
       @newline = false
       @output << input
       @current_line << input
     end
 
-    def visit(node, parent_node)
+    def visit(node)
       case node.type
       when :module
         write "module "
-        visit node.children[0], node
+        visit node.children[0]
         newline
 
         indent do
-          visit node.children[1], node
+          visit node.children[1]
         end
 
         write "end"
@@ -130,46 +130,46 @@ module Prettyrb
       when :class
         newline unless @previous_node.nil?
         write "class "
-        visit node.children[0], node
+        visit node.children[0]
         newline
         # TODO handle children[1] which is inheritance
 
         indent do
-          visit node.children[2], node
+          visit node.children[2] if node.children[2]
         end
 
         newline unless @output.end_with?("\n")
         write "end"
         newline
       when :const
-        visit node.children[0], node if node.children[0]
+        visit node.children[0] if node.children[0]
         write node.children[1].to_s
       when :casgn
         write node.children[1].to_s
         write " = "
-        visit node.children[2], node
+        visit node.children[2]
       when :block
         newline unless @previous_node.nil?
-        visit node.children[0], node
+        visit node.children[0]
         write " do"
 
         if node.children[1].children.length > 0
           write " |"
-          visit node.children[1], node
+          visit node.children[1]
           write "|"
         end
 
         newline
 
         indent do
-          visit node.children[2], node
+          visit node.children[2]
         end
 
         newline
 
         write "end"
       when :send
-        newline if parent_node&.type == :begin && @previous_node && @previous_node&.type != :send
+        newline if node.parent&.type == :begin && @previous_node && @previous_node&.type != :send
         if node.children[0] == nil
           write node.children[1].to_s
 
@@ -187,22 +187,24 @@ module Prettyrb
 
           newline if @previous_node&.type == :class 
         elsif node.children[1] == :[]
-          visit node.children[0], node
+          visit node.children[0]
           write "["
-          visit node.children[2], node
+          visit node.children[2]
           write "]"
         elsif node.children[1] == :!
           write "!"
-          visit node.children[0], node
+          visit node.children[0]
+        elsif node.children[1] == :-@ && node.children[2].nil?
+          write "-"
+          visit node.children[0]
         elsif !node.children[1].to_s.match?(/[a-zA-Z]/)
-        # if [:!=, :==, :+, :-, :*, :/, :<<, :<].include?(node.children[1])
-          visit node.children[0], node
+          visit node.children[0]
           write " "
           write node.children[1].to_s
           write " "
-          visit node.children[2], node
+          visit node.children[2]
         else
-          visit node.children[0], node
+          visit node.children[0]
           write "."
           write node.children[1].to_s
 
@@ -211,99 +213,58 @@ module Prettyrb
           if arguments.length > 0
             write "("
             arguments.each_with_index do |child_node, index|
-              visit child_node, node
+              visit child_node
               write ", " unless index == arguments.length - 1
             end
             write ")"
           end
         end
       when :if
-        newline if @previous_node && parent_node&.type != :if
+        newline if @previous_node && node.parent&.type != :if
+        conditions = node.conditions_node
 
-        if parent_node&.type == :if
-          conditions_node = node.children[0]
-          body_node = node.children[1]
-          else_body_node = node.children[2]
+        write node.if_type
 
-          write "elsif"
-
-          conditions = capture do
-            visit conditions_node, node
-          end
+        conditions = capture do
+          visit node.children[0]
+        end
 
+        indent do
           if !conditions.start_with?("\n")
             write(" ")
-          end
-
-          write conditions
-          newline
-
-          if body_node.type == :if
-            visit body_node, node
+            write conditions
           else
-            indent do
-              visit body_node, node
+            visit node.conditions_node
+
+            dedent do
+              newline
+              write "then"
             end
           end
 
           newline
+          visit node.body_node
+        end
 
-          if else_body_node&.type == :if
-            visit else_body_node, node
-          elsif else_body_node
-            write "else"
-            newline
-            indent do
-              visit else_body_node, node
-            end
-          end
-        else
-          is_unless = node.children[1].nil? && node.children[2]&.type != :if
-          conditions = node.children[0]
+        newline
 
-          if is_unless
-            write "unless"
-            body_node = node.children[2]
-            else_body_node = nil
+        if node.else_body_node
+          if node.has_elsif?
+            visit node.else_body_node
           else
-            write "if" unless parent_node&.type == :if
-            body_node = node.children[1]
-            else_body_node = node.children[2]
-          end
-
-          indent do
-            conditions = capture do
-              visit node.children[0], node
-            end
-
-            if !conditions.start_with?("\n")
-              write(" ")
-            end
-
-            write conditions
+            write "else"
             newline
 
-            if body_node
-              visit body_node, node
-              newline
+            indent do
+              visit node.else_body_node
             end
-          end
 
-          if else_body_node
-            if else_body_node.type == :if
-              visit else_body_node, node
-            else
-              write "else"
-              newline
-
-              indent do
-                visit else_body_node, node
-              end
-            end
             newline
           end
+        end
 
-          write "end" unless parent_node&.type == :if
+        if !node.is_elsif?
+          write "end"
         end
       when :true
         write "true"
@@ -313,39 +274,84 @@ module Prettyrb
         write "nil"
       when :int, :float
         write node.children[0].to_s
+      when :next
+        write "next"
+
+        if node.children[0]
+          write " "
+          visit node.children[0]
+        end
       when :array
-        if node.children[0].type == :splat
-          visit node.children[0], node
+        if node.children[0]&.type == :splat
+          visit node.children[0]
         else
-          write "["
-          indent do
-            result = splittable_separated_map(node, node.children)
-            newline if result == MULTI_LINE
+          write "[" unless node.parent&.type == :resbody
+          if node.children.length > 0
+            indent do
+              result = splittable_separated_map(node, node.children)
+              newline if result == MULTI_LINE
+            end
           end
-          write "]"
+          write "]" unless node.parent&.type == :resbody
         end
       when :str
-        write '"'
-        write format_string(node)
-        write '"'
+        if node.heredoc?
+          if node&.parent&.type == :send
+            write "("
+          end
+          write "<<"
+          write node.heredoc_type if node.heredoc_type
+          write node.heredoc_identifier
+          newline
+          write node.heredoc_body, skip_indent: true
+          @newline = true
+          write node.heredoc_identifier
+
+          if node&.parent&.type == :send
+            newline
+            write ")"
+          end
+        else
+          write '"'
+          write node.format
+          write '"'
+        end
       when :dstr
-        write "\""
-        node.children.map do |child|
-          if child.type == :str
-            write child.children[0] # TODO better handling
-          else
-            write '#{'
-            visit child, node
-            write '}'
+        if node.heredoc?
+          if node&.parent&.type == :send
+            write "("
+          end
+          write "<<"
+          write node.heredoc_type if node.heredoc_type
+          write node.heredoc_identifier
+          newline
+          write node.heredoc_body, skip_indent: true
+          @newline = true
+          write node.heredoc_identifier
+
+          if node&.parent&.type == :send
+            newline
+            write ")"
+          end
+        else
+          write "\""
+          node.children.map do |child|
+            if child.type == :str
+              write child.format
+            else
+              write '#{'
+              visit child
+              write '}'
+            end
           end
+          write "\""
         end
-        write "\""
       when :begin
         if @previous_node&.type == :or || @previous_node&.type == :and
           write "("
           @previous_node = nil
           node.children.map do |child|
-            visit child, node
+            visit child
             @previous_node = child
           end
           @previous_node = nil
@@ -353,22 +359,22 @@ module Prettyrb
         else
           @previous_node = nil
           node.children.each_with_index do |child, index|
-            visit child, node
+            visit child
             newline unless index == node.children.length - 1
             @previous_node = child
           end
           @previous_node = nil
         end
       when :or, :and
-        write "(" if parent_node&.type == :begin
+        write "(" if node.parent&.type == :begin
         possible_output = capture do
-          visit node.children[0], node
+          visit node.children[0]
           if node.type == :or
             write " || "
           elsif node.type == :and
             write " && "
           end
-          visit node.children[1], node
+          visit node.children[1]
         end
         if @multiline_conditional_level > 0 # TODO track and check currently level
           write_multiline_conditional(node)
@@ -377,15 +383,10 @@ module Prettyrb
             newline
             write_multiline_conditional(node)
           end
-
-          dedent do
-            newline
-            write "then"
-          end
         else
           write possible_output
         end
-        write ")" if parent_node&.type == :begin
+        write ")" if node.parent&.type == :begin
       when :def, :defs
         newline unless @previous_node&.type.nil?
         if node.type == :defs
@@ -404,14 +405,14 @@ module Prettyrb
 
         if arguments_node.children.length > 0 || arguments_node.type != :args
           write "("
-          visit arguments_node, node
+          visit arguments_node
           write ")"
         end
         newline
 
         if body_node
           indent do
-            visit body_node, node
+            visit body_node
           end
 
           newline
@@ -420,7 +421,7 @@ module Prettyrb
         write "end"
       when :args
         node.children.each_with_index do |child, index|
-          visit child, node
+          visit child
           write ", " unless index == node.children.length - 1
         end
       when :arg
@@ -438,7 +439,7 @@ module Prettyrb
           write ":"
           write content
         else
-          if parent_node&.type == :pair
+          if node.parent&.type == :pair
             write content
             write ": "
           else
@@ -449,16 +450,18 @@ module Prettyrb
       when :return
         write "return"
 
-        possible_output = capture do
-          visit node.children[0], node
-        end
+        if node.children[0]
+          possible_output = capture do
+            visit node.children[0]
+          end
 
-        if !possible_output.start_with?("\n")
-          write " "
+          if !possible_output.start_with?("\n")
+            write " "
+          end
         end
       when :case
         write "case "
-        visit node.children[0], node
+        visit node.children[0]
         newline
         node.children[1..-1].each do |child|
           if child && child.type != :when
@@ -466,11 +469,11 @@ module Prettyrb
             newline
 
             indent do
-              visit child, node
+              visit child
             end
           else
             if child
-              visit child, node
+              visit child
               newline
             end
           end
@@ -482,11 +485,11 @@ module Prettyrb
           if child_node.type == :str
             write child_node.children[0].to_s
           else
-            visit child_node, node
+            visit child_node
           end
         end
         write '/'
-        visit node.children[-1], node
+        visit node.children[-1]
       when :regopt
         node.children.map { |child| child.to_s }.join('')
       when :when
@@ -498,27 +501,27 @@ module Prettyrb
 
         newline
         indent do
-          visit node.children[-1], node
+          visit node.children[-1]
         end
       when :or_asgn, :and_asgn
         newline if @previous_node && ![:ivasgn, :or_asgn, :lvasgn, :op_asgn].include?(@previous_node.type)
-        visit node.children[0], node
+        visit node.children[0]
         if node.type == :or_asgn
           write " ||= " # TODO handle long lines here too
         elsif node.type == :and_asgn
           write " &&= " # TODO handle long lines here too
         end
-        visit node.children[1], node
+        visit node.children[1]
       when :ivasgn
         newline if @previous_node && ![:ivasgn, :or_asgn, :lvasgn, :op_asgn].include?(@previous_node.type)
         write node.children[0].to_s
 
         if node.children[1]
           write " = "
-          visit node.children[1], node
+          visit node.children[1]
         end
       when :csend
-        visit node.children[0], node
+        visit node.children[0]
         write "&."
         write node.children[1].to_s
       when :ivar
@@ -531,27 +534,27 @@ module Prettyrb
         write "yield"
       when :op_asgn
         newline if @previous_node && ![:ivasgn, :or_asgn, :lvasgn, :op_asgn].include?(@previous_node.type)
-        visit node.children[0], node
+        visit node.children[0]
         write " "
         write node.children[1].to_s
         write "="
         write " "
-        visit node.children[2], node
+        visit node.children[2]
       when :lvasgn
         newline if @previous_node && ![:ivasgn, :or_asgn, :lvasgn, :op_asgn].include?(@previous_node.type)
         write node.children[0].to_s
         if node.children[1]
           write " = "
-          visit node.children[1], node
+          visit node.children[1]
         end
       when :irange
-        visit node.children[0], node unless node.children[0].nil?
+        visit node.children[0] unless node.children[0].nil?
         write ".."
-        visit node.children[1], node unless node.children[1].nil?
+        visit node.children[1] unless node.children[1].nil?
       when :erange
-        visit node.children[0], node unless node.children[0].nil?
+        visit node.children[0] unless node.children[0].nil?
         write "..."
-        visit node.children[1], node unless node.children[1].nil?
+        visit node.children[1] unless node.children[1].nil?
       when :hash
         if node.children.length == 0
           write "{}"
@@ -570,17 +573,17 @@ module Prettyrb
           end
         end
       when :pair
-        visit node.children[0], node
+        visit node.children[0]
         if node.children[0].type != :sym
           write " => "
         end
-        visit node.children[1], node
+        visit node.children[1]
       when :splat
         write "*"
-        visit node.children[0], node
+        visit node.children[0]
       when :defined?
         write "defined?("
-        visit node.children[0], node
+        visit node.children[0]
         write ")"
       when :complex,
         :dsym,
@@ -588,17 +591,16 @@ module Prettyrb
         :'nth-ref',
         :'back-ref',
         :gvasgn,
-        :mlhs,
         :procarg0,
         :shadowarg
         raise "implement me, #{node.inspect}"
       when :sclass
         write "class << "
-        visit node.children[0], node
+        visit node.children[0]
         newline
 
         indent do
-          visit node.children[1], node if node.children[1]
+          visit node.children[1] if node.children[1]
         end
 
         newline if node.children[1]
@@ -606,24 +608,24 @@ module Prettyrb
       when :undef
         write "undef "
         node.children.each_with_index do |child_node, index|
-          visit child_node, node
+          visit child_node
           write ", " unless index == node.children.length - 1
         end
       when :alias
         write 'alias '
-        visit node.children[0], node
+        visit node.children[0]
         write ' '
-        visit node.children[1], node
+        visit node.children[1]
       when :restarg
         write "*"
         write node.children[0].to_s
       when :optarg
         write node.children[0].to_s
         write " = "
-        visit node.children[1], node
+        visit node.children[1]
       when :kwsplat
         write "**"
-        visit node.children[0], node
+        visit node.children[0]
       when :kwarg
         write node.children[0].to_s
         write ":"
@@ -632,7 +634,7 @@ module Prettyrb
       when :kwoptarg
         write node.children[0].to_s
         write ": "
-        visit node.children[1], node
+        visit node.children[1]
       when :kwrestarg
         write "**"
         write node.children[0].to_s if node.children[0]
@@ -640,13 +642,79 @@ module Prettyrb
         write "**nil"
       when :cbase
         write "::"
+      when :zsuper
+        write "super"
+      when :nth_ref
+        write "$"
+        write node.children[0].to_s
+      when :masgn
+        left = node.children[0...-1]
+        right = node.children[-1]
+
+        left.each_with_index do |child_node, index|
+          visit child_node
+        end
+
+        write " = "
+        visit right
+      when :mlhs
+        write "(" if node.parent&.type == :mlhs
+        node.children.each_with_index do |child_node, index|
+          visit child_node
+          write ", " unless index == node.children.length - 1
+        end
+        write ")" if node.parent&.type == :mlhs
+      when :block_pass
+        write "&"
+        visit node.children[0]
+      when :kwbegin
+        write "begin"
+        newline
+        indent do
+          visit node.children[0]
+        end
+        newline
+        write "end"
+      when :rescue
+        visit node.children[0]
+        newline
+
+        dedent do
+          write "rescue"
+          visit node.children[1]
+        end
+      when :resbody
+        if node.children[0]
+          write " "
+          visit node.children[0] if node.children[0]
+        end
+
+        if node.children[1]
+          write " => "
+          write node.children[1].children[0].to_s
+        end
+        newline
+
+        indent do
+          visit node.children[2] if node.children[2]
+        end
+      when :ensure
+        visit node.children[0] if node.children[0]
+        newline
+
+        dedent do
+          write "ensure"
+        end
+
+        newline
+        visit node.children[1] if node.children[1]
       else
         raise "unhandled node type `#{node.type}`\nnode: #{node}"
       end
     end
 
     def write_multiline_conditional(node)
-      visit node.children[0], node
+      visit node.children[0]
 
       if node.type == :or
         write " ||"
@@ -656,7 +724,7 @@ module Prettyrb
 
       newline
 
-      visit node.children[1], node
+      visit node.children[1]
     end
 
     def format_string(string)
@@ -673,7 +741,7 @@ module Prettyrb
     def splittable_separated_map(current_node, mappable, separator: ", ", skip_last_multiline_separator: false, write_space_if_single_line: false)
       one_line = capture do
         mappable.each_with_index do |child_node, index|
-          visit child_node, current_node
+          visit child_node
           write separator unless index == mappable.length - 1
         end
       end
@@ -681,7 +749,7 @@ module Prettyrb
       if @current_line.length + one_line.length > MAX_LENGTH
         mappable.each_with_index do |child_node, index|
           newline
-          visit child_node, current_node
+          visit child_node
           write separator.rstrip unless skip_last_multiline_separator && index == mappable.length - 1
         end
         MULTI_LINE

data/lib/prettyrb.rb

@@ -1,6 +1,12 @@
 require "parser/current"
 require "prettyrb/version"
 
+require "prettyrb/nodes/base_node"
+require "prettyrb/nodes/if_node"
+require "prettyrb/nodes/string_helper"
+require "prettyrb/nodes/str_node"
+require "prettyrb/nodes/dstr_node"
+require "prettyrb/builder"
 require "prettyrb/formatter"
 require "prettyrb/visitor"
 

data/prettyrb.gemspec

@@ -35,9 +35,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "parser", "~> 2.7.0.5"
   spec.add_dependency "thor"
 
-  spec.add_development_dependency "bundler", "~> 1.17"
+  spec.add_development_dependency "bundler", "~> 2.1.4"
   spec.add_development_dependency "rake", "~> 12.3.3"
   spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "byebug", "~> 11.1"
+  spec.add_development_dependency "pry", "~> 0.13"
   spec.add_development_dependency "simplecov", "~> 0.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prettyrb
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Blake Williams
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-06 00:00:00.000000000 Z
+date: 2020-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -81,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '0.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -129,8 +129,14 @@ files:
 - bin/setup
 - exe/prettyrb
 - lib/prettyrb.rb
+- lib/prettyrb/builder.rb
 - lib/prettyrb/cli.rb
 - lib/prettyrb/formatter.rb
+- lib/prettyrb/nodes/base_node.rb
+- lib/prettyrb/nodes/dstr_node.rb
+- lib/prettyrb/nodes/if_node.rb
+- lib/prettyrb/nodes/str_node.rb
+- lib/prettyrb/nodes/string_helper.rb
 - lib/prettyrb/version.rb
 - lib/prettyrb/visitor.rb
 - prettyrb.gemspec
@@ -154,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: Ruby source code formatter