rufo 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dee48483405a03bf26d15795f7d17aec4859813
-  data.tar.gz: 2003268779c62c5ba28066b176112baec2200aff
+  metadata.gz: 8c3067349b8d78ecb9c824cb5ffd701e036532ff
+  data.tar.gz: 27c3b81f7a251b93d318dd84fed77b136dbcb420
 SHA512:
-  metadata.gz: c1199060cc3e550ab376e758d04605692dd25c295a67dc329d214a0d6055ee8eac43e6812e8b75ebcfa2021a5f8a06e31d3c06975be8ecb100867e0f30984cc9
-  data.tar.gz: '093f40f565a3d9c229ad7e467e5ba82a170844444cbdaf0d5d02795df65a1a2c9041fe7e95bb7191454bdd2895e5f1c5d2abb267df15b7aa34be6b1a5a271f77'
+  metadata.gz: 2bc69a1bf16c36c68f025a9593c00bc085cfeb004f0fcd2a7faafb2b289f07bd6d4d15d645dcaca7cb5fde6acf8e8c0050a5a0ccb8ccbd0382e853416ce442c3
+  data.tar.gz: b15595976259d23deeb7e2ef774e527ccfd1c95ef1880cdd6ec4ae05bf60e1e787d0334beaa36b01d7c7e0c1b7e87a9810837e13f860f0314357243a2531e1e4

data/lib/rufo.rb

@@ -10,5 +10,6 @@ module Rufo
   end
 end
 
+require_relative "rufo/backport"
 require_relative "rufo/command"
 require_relative "rufo/formatter"

data/lib/rufo/backport.rb

@@ -0,0 +1,29 @@
+module Rufo::Backport
+  # Implement Enumerable#chunk_while
+  # if it's not available in the current Ruby version
+  def self.chunk_while(array)
+    results = []
+    current = []
+    first = true
+    last = nil
+
+    array.each do |elem|
+      if first
+        current << elem
+        first = false
+      else
+        if yield(last, elem)
+          current << elem
+        else
+          results << current
+          current = [elem]
+        end
+      end
+      last = elem
+    end
+
+    results << current unless current.empty?
+
+    results
+  end
+end

data/lib/rufo/formatter.rb

@@ -106,10 +106,15 @@ class Rufo::Formatter
       # [:void_stmt]
       skip_space_or_newline
     when :@int
-      # Number literal
+      # Integer literal
       #
       # [:@int, "123", [1, 0]]
       consume_token :on_int
+    when :@float
+      # Float literal
+      #
+      # [:@int, "123.45", [1, 0]]
+      consume_token :on_float
     when :@gvar
       # [:@gvar, "$abc", [1, 0]]
       write node[1]
@@ -118,7 +123,7 @@ class Rufo::Formatter
       # [:@backref, "$1", [1, 0]]
       write node[1]
       next_token
-    when :string_literal
+    when :string_literal, :xstring_literal
       visit_string_literal node
     when :string_concat
       visit_string_concat node
@@ -141,6 +146,8 @@ class Rufo::Formatter
       visit_string_interpolation node
     when :symbol_literal
       visit_symbol_literal(node)
+    when :symbol
+      visit_symbol(node)
     when :dyna_symbol
       visit_quoted_symbol_literal(node)
     when :@ident
@@ -306,6 +313,10 @@ class Rufo::Formatter
       visit_super(node)
     when :defined
       visit_defined(node)
+    when :alias
+      visit_alias(node)
+    when :mlhs_add_star
+      visit_mlhs_add_star(node)
     else
       bug "Unhandled node: #{node.first}"
     end
@@ -379,6 +390,8 @@ class Rufo::Formatter
         @heredocs << [@current_call, node, tilde]
         return
       end
+    elsif current_token_kind == :on_backtick
+      consume_token :on_backtick
     else
       consume_token :on_tstring_beg
     end
@@ -393,9 +406,12 @@ class Rufo::Formatter
   end
 
   def visit_string_literal_end(node)
-    visit_exps(node[1][1..-1], false, false)
+    inner = node[1]
+    inner = inner[1..-1] unless node[0] == :xstring_literal
+    visit_exps(inner, false, false)
 
-    if current_token_kind == :on_heredoc_end
+    case current_token_kind
+    when :on_heredoc_end
       heredoc, tilde = @current_heredoc
       if heredoc && tilde
         write_indent
@@ -404,6 +420,8 @@ class Rufo::Formatter
         write current_token_value.rstrip
       end
       next_token
+    when :on_backtick
+      consume_token :on_backtick
     else
       consume_token :on_tstring_end
     end
@@ -432,8 +450,19 @@ class Rufo::Formatter
     # :foo
     #
     # [:symbol_literal, [:symbol, [:@ident, "foo", [1, 1]]]]
+    #
+    # A symbol literal not necessarily begins with `:`.
+    # For example, an `alias foo bar` will treat `foo`
+    # a as symbol_literal but without a `:symbol` child.
+    visit node[1]
+  end
+
+  def visit_symbol(node)
+    # :foo
+    #
+    # [:symbol, [:@ident, "foo", [1, 1]]]
     consume_token :on_symbeg
-    visit_exps node[1][1..-1], false, false
+    visit_exps node[1..-1], false, false
   end
 
   def visit_quoted_symbol_literal(node)
@@ -586,7 +615,7 @@ class Rufo::Formatter
     # exp rescue handler
     #
     # [:if_mod, cond, body]
-    _, cond, body = node
+    _, body, cond = node
 
     visit body
     consume_space
@@ -1052,9 +1081,10 @@ class Rufo::Formatter
   end
 
   def visit_comma_separated_list(nodes, inside_call = false)
-    # This is `x, *y, z` on the left hand side of an assignment
-    if nodes[0] == :mlhs_add_star
-      visit_mlhs_add_star(nodes)
+    # When there's *x inside a left hand side assignment
+    # or a case when, it comes as [:op, ...]
+    if nodes[0].is_a?(Symbol)
+      visit nodes
       return
     end
 
@@ -1358,10 +1388,12 @@ class Rufo::Formatter
 
     if rest_param
       # [:rest_param, [:@ident, "x", [1, 15]]]
+      _, rest = rest_param
+
       write_params_comma if needs_comma
       consume_op "*"
       skip_space_or_newline
-      visit rest_param[1]
+      visit rest if rest
       needs_comma = true
     end
 
@@ -1392,7 +1424,9 @@ class Rufo::Formatter
       write_params_comma if needs_comma
       consume_op "**"
       skip_space_or_newline
-      visit double_star_param
+
+      # A nameless double star comes as an... Integer? :-S
+      visit double_star_param if double_star_param.is_a?(Array)
       skip_space_or_newline
       needs_comma = true
     end
@@ -1461,7 +1495,7 @@ class Rufo::Formatter
     # For %W it seems elements appear inside other arrays
     # for some reason, so we flatten them
     if elements[0].is_a?(Array) && elements[0][0].is_a?(Array)
-      elements = elements.flat_map(&:itself)
+      elements = elements.flat_map { |x| x }
     end
 
     write current_token_value.strip
@@ -1631,21 +1665,26 @@ class Rufo::Formatter
 
     skip_space
 
-    if newline? || comment?
-      needed_indent = next_indent
-      if args
-        consume_end_of_line
-        write_indent(needed_indent)
+    # Sometimes args comes with an array...
+    if args && args[0].is_a?(Array)
+      visit_literal_elements args
+    else
+      if newline? || comment?
+        needed_indent = next_indent
+        if args
+          consume_end_of_line
+          write_indent(needed_indent)
+        else
+          skip_space_or_newline
+        end
       else
-        skip_space_or_newline
+        needed_indent = column
       end
-    else
-      needed_indent = column
-    end
 
-    if args
-      indent(needed_indent) do
-        visit args
+      if args
+        indent(needed_indent) do
+          visit args
+        end
       end
     end
 
@@ -1856,6 +1895,17 @@ class Rufo::Formatter
     end
   end
 
+  def visit_alias(node)
+    # [:alias, from, to]
+    _, from, to = node
+
+    consume_keyword "alias"
+    consume_space
+    visit from
+    consume_space
+    visit to
+  end
+
   def visit_literal_elements(elements)
     base_column = @column
 
@@ -2498,7 +2548,7 @@ class Rufo::Formatter
     elements.reject! { |l, c, indent, id, off, ignore| ignore == :ignore }
 
     # Chunk comments that are in consecutive lines
-    chunks = elements.chunk_while do |(l1, c1, i1, id1), (l2, c2, i2, id2)|
+    chunks = chunk_while(elements) do |(l1, c1, i1, id1), (l2, c2, i2, id2)|
       l1 + 1 == l2 && i1 == i2 && id1 == id2
     end
 
@@ -2526,6 +2576,14 @@ class Rufo::Formatter
     @output = lines.join
   end
 
+  def chunk_while(array, &block)
+    if array.respond_to?(:chunk_while)
+      array.chunk_while(&block)
+    else
+      Rufo::Backport.chunk_while(array, &block)
+    end
+  end
+
   def result
     @output
   end

data/lib/rufo/version.rb

@@ -1,3 +1,3 @@
 module Rufo
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rufo
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Ary Borenszweig
@@ -72,6 +72,7 @@ files:
 - bin/setup
 - exe/rufo
 - lib/rufo.rb
+- lib/rufo/backport.rb
 - lib/rufo/command.rb
 - lib/rufo/formatter.rb
 - lib/rufo/version.rb