rufo 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0aa53149a53b3f3ff74b0faac96f745fb8de3bc
-  data.tar.gz: df17be90c64c3bab54fd6fec7cc4cfa50e29308d
+  metadata.gz: 7b047d001bf378b8733edc5693f53028394707a7
+  data.tar.gz: eeebbd17f2c9a4bd8a432629bc008bebfced7204
 SHA512:
-  metadata.gz: 01d29475450119316f571f6812d3137a8cd32d1e4dfc3b9ce66fdc808de906c65a6667fd997d6485c6ba067bf192dd5be527589a8c7b12751e0896b999b1da6c
-  data.tar.gz: 8d23542daf66eb90d1f2e0b6b05d150654a9e6c636c3993aa9c48bac995c91e7bdff1f2542d2dc98b15ce4c22f32d0814d12fee80156a06889cb0b17432f57bb
+  metadata.gz: '082317f331df08fca9951fd18d64b458da6ce0fd118a1129da5f6b54e81b8618ce3e5894cda151c40246ed71dc3d12e19c3db3d06b4a9a12c1bbbffd06cf6b39'
+  data.tar.gz: 71e4d7f9c434c7693202a639d3644e93d5124070bd5ee4908efed5aa957aaef2018a8170d4ada5ba07a328a90654e8fbbd3f2504a757a8235a33bef336098840

data/lib/rufo/formatter.rb

@@ -83,7 +83,9 @@ class Rufo::Formatter
 
   def format
     visit @sexp
+    consume_end
     write_line unless @last_was_newline
+
     do_align_comments if @align_comments
     do_align_assignments if @align_assignments
     do_align_hash_keys if @align_hash_keys
@@ -115,6 +117,16 @@ class Rufo::Formatter
       #
       # [:@int, "123.45", [1, 0]]
       consume_token :on_float
+    when :@rational
+      # Rational literal
+      #
+      # [:@rational, "123r", [1, 0]]
+      consume_token :on_rational
+    when :@imaginary
+      # Imaginary literal
+      #
+      # [:@imaginary, "123i", [1, 0]]
+      consume_token :on_imaginary
     when :@CHAR
       # [:@CHAR, "?a", [1, 0]]
       consume_token :on_CHAR
@@ -332,7 +344,7 @@ class Rufo::Formatter
       visit_super(node)
     when :defined
       visit_defined(node)
-    when :alias
+    when :alias, :var_alias
       visit_alias(node)
     when :undef
       visit_undef(node)
@@ -343,6 +355,10 @@ class Rufo::Formatter
       consume_keyword "retry"
     when :for
       visit_for(node)
+    when :BEGIN
+      visit_BEGIN(node)
+    when :END
+      visit_END(node)
     else
       bug "Unhandled node: #{node.first}"
     end
@@ -586,9 +602,8 @@ class Rufo::Formatter
     visit_comma_separated_list lefts
     skip_space
 
-    # A trailing comma can come after the left hand side,
-    # and we remove it
-    next_token if comma?
+    # A trailing comma can come after the left hand side
+    consume_token :on_comma if comma?
 
     consume_space
     track_assignment
@@ -1198,6 +1213,39 @@ class Rufo::Formatter
     consume_keyword "end"
   end
 
+  def visit_BEGIN(node)
+    visit_BEGIN_or_END node, "BEGIN"
+  end
+
+  def visit_END(node)
+    visit_BEGIN_or_END node, "END"
+  end
+
+  def visit_BEGIN_or_END(node, keyword)
+    # [:BEGIN, body]
+    _, body = node
+
+    consume_keyword(keyword)
+    consume_space
+
+    closing_brace_token = find_closing_brace_token
+
+    # If the whole block fits into a single line, format
+    # in a single line
+    if current_token[0][0] == closing_brace_token[0][0]
+      consume_token :on_lbrace
+      consume_space
+      visit_exps body, false, false
+      consume_space
+      consume_token :on_rbrace
+    else
+      consume_token :on_lbrace
+      indent_body body
+      write_indent
+      consume_token :on_rbrace
+    end
+  end
+
   def visit_comma_separated_list(nodes, inside_call = false)
     # When there's *x inside a left hand side assignment
     # or a case when, it comes as [:op, ...]
@@ -2506,6 +2554,21 @@ class Rufo::Formatter
     next_token
   end
 
+  def consume_end
+    return unless current_token_kind == :on___end__
+
+    line = current_token[0][0]
+
+    write_line
+    consume_token :on___end__
+
+    lines = @code.lines[line..-1]
+    lines.each do |line|
+      write line.chomp
+      write_line
+    end
+  end
+
   def indent(value = nil)
     if value
       old_indent = @indent
@@ -2662,6 +2725,7 @@ class Rufo::Formatter
         return token if count == 0
       end
     end
+    nil
   end
 
   def next_token

data/lib/rufo/version.rb

@@ -1,3 +1,3 @@
 module Rufo
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rufo
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Ary Borenszweig