rufo 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 372a723ce561b8de2f2b66f0c7e75a54a3244c70
-  data.tar.gz: 2dc0c9d5c1bcd2b73a9cb0db3d9ed3f447cdbb08
+  metadata.gz: 9b4f9efa0b1ba8d9770f669de9facdb1b8b94d69
+  data.tar.gz: d851a347f0ca90587d9dc4575dd8a8e62f3e1105
 SHA512:
-  metadata.gz: 0c54acef4e1604b32a35c87a939c698f7a58982f1bbee9b9fd3161bff76c2fe8db94f10a98d446cd91794b46d4e43857c7a97dbc759f5567f3863e1ee80d881d
-  data.tar.gz: 071775e9ecba0da5b9c4cd3bdde5c65c7b8995589fd48269e0db74778cbab38fe4d5f07c94784dbb162a8c04bd3695835947e991ff9d5dc8f655c019f6d749bd
+  metadata.gz: 8b82667aad953010424caba2aa78c61234262932b9b3bfeee74c8ad6957c247f2911a8998b21e2ef1f65c4c18d87947310dab59f1ec057d69efbb174c18804e2
+  data.tar.gz: b430c54354544cd27f46cd11d873fc172f8dbc8d9be5c37dc6cd4a1875c8e72736945f44acf71e866c92f7b8368036d572a5d8b79fcfe0c7b9e43d87bb099fea

data/lib/rufo/formatter.rb

@@ -29,8 +29,8 @@ class Rufo::Formatter
     # Heredocs list, associated with calls ([call, heredoc, tilde])
     @heredocs = []
 
-    # Current call, to be able to associate it to heredocs
-    @current_call = nil
+    # Current node, to be able to associate it to heredocs
+    @current_node = nil
 
     # The current heredoc being printed
     @current_heredoc = nil
@@ -115,6 +115,9 @@ class Rufo::Formatter
       #
       # [:@int, "123.45", [1, 0]]
       consume_token :on_float
+    when :@CHAR
+      # [:@CHAR, "?a", [1, 0]]
+      consume_token :on_CHAR
     when :@gvar
       # [:@gvar, "$abc", [1, 0]]
       write node[1]
@@ -141,6 +144,9 @@ class Rufo::Formatter
       else
         consume_token :on_tstring_content
       end
+    when :string_content
+      # [:string_content, exp]
+      visit_exps node[1..-1], false, false
     when :string_embexpr
       # String interpolation piece ( #{exp} )
       visit_string_interpolation node
@@ -254,6 +260,8 @@ class Rufo::Formatter
       visit_mrhs_new_from_args(node)
     when :mlhs_paren
       visit_mlhs_paren(node)
+    when :mrhs_add_star
+      visit_mrhs_add_star(node)
     when :def
       visit_def(node)
     when :defs
@@ -319,6 +327,9 @@ class Rufo::Formatter
       visit_undef(node)
     when :mlhs_add_star
       visit_mlhs_add_star(node)
+    when :retry
+      # [:retry]
+      consume_keyword "retry"
     else
       bug "Unhandled node: #{node.first}"
     end
@@ -345,7 +356,14 @@ class Rufo::Formatter
         end
       end
 
-      visit exp
+      push_node(exp) do
+        visit exp
+      end
+
+      skip_space
+      if newline? || comment?
+        check_heredocs_at_call_end(exp)
+      end
 
       line_before_endline = @line
 
@@ -388,8 +406,8 @@ class Rufo::Formatter
       # The same happens if we already have a heredoc in
       # the list, which means this will come after other
       # heredocs.
-      if comma? || !@heredocs.empty?
-        @heredocs << [@current_call, node, tilde]
+      if comma? || (current_token_kind == :on_period) || !@heredocs.empty?
+        @heredocs << [@current_node, node, tilde]
         return
       end
     elsif current_token_kind == :on_backtick
@@ -422,6 +440,12 @@ class Rufo::Formatter
         write current_token_value.rstrip
       end
       next_token
+      skip_space
+
+      if newline?
+        write_line
+        write_indent
+      end
     when :on_backtick
       consume_token :on_backtick
     else
@@ -471,9 +495,18 @@ class Rufo::Formatter
     # :"foo"
     #
     # [:dyna_symbol, exps]
-    consume_token :on_symbeg
-    visit_exps node[1], false, false
-    consume_token :on_tstring_end
+    _, exps = node
+
+    # This is `"...":` as a hash key
+    if current_token_kind == :on_tstring_beg
+      consume_token :on_tstring_beg
+      visit exps
+      consume_token :on_label_end
+    else
+      consume_token :on_symbeg
+      visit_exps exps, false, false
+      consume_token :on_tstring_end
+    end
   end
 
   def visit_path(node)
@@ -532,6 +565,12 @@ class Rufo::Formatter
     _, lefts, right = node
 
     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?
+
     consume_space
     track_assignment
     consume_op "="
@@ -774,7 +813,11 @@ class Rufo::Formatter
   def visit_command_end(node, args)
     push_call(node) do
       indent(@column) do
-        visit args
+        if args[0].is_a?(Symbol)
+          visit args
+        else
+          visit_exps args, false, false
+        end
       end
     end
 
@@ -946,11 +989,10 @@ class Rufo::Formatter
     if !args.empty? && args[0] == :args_add_star
       # arg1, ..., *star
       visit args
-      return
+    else
+      visit_comma_separated_list args, true
     end
 
-    visit_comma_separated_list args, true
-
     if block_arg
       write_params_comma if comma?
 
@@ -1044,7 +1086,7 @@ class Rufo::Formatter
   end
 
   def visit_rescue_types(node)
-    if node[0] == :mrhs_new_from_args
+    if node[0].is_a?(Symbol)
       visit node
     else
       visit_exps node, false, false
@@ -1054,8 +1096,13 @@ class Rufo::Formatter
   def visit_mrhs_new_from_args(node)
     # Multiple exception types
     # [:mrhs_new_from_args, exps, final_exp]
-    nodes = [*node[1], node[2]]
-    visit_comma_separated_list(nodes)
+    _, exps, final_exp = node
+    if final_exp
+      nodes = [*node[1], node[2]]
+      visit_comma_separated_list(nodes)
+    else
+      visit exps
+    end
   end
 
   def visit_mlhs_paren(node)
@@ -1086,6 +1133,22 @@ class Rufo::Formatter
     end
   end
 
+  def visit_mrhs_add_star(node)
+    # [:mrhs_add_star, [], [:vcall, [:@ident, "x", [3, 8]]]]
+    _, x, y = node
+
+    if x.empty?
+      consume_op "*"
+      visit y
+    else
+      visit x
+      write_params_comma
+      consume_space
+      consume_op "*"
+      visit y
+    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, ...]
@@ -1516,9 +1579,14 @@ class Rufo::Formatter
 
     if elements
       elements.each_with_index do |elem, i|
-        # elem is [:@tstring_content, string, [1, 5]
-        write elem[1].strip
-        next_token
+        if elem[0] == :@tstring_content
+          # elem is [:@tstring_content, string, [1, 5]
+          write elem[1].strip
+          next_token
+        else
+          visit elem
+        end
+
         unless last?(i, elements)
           check :on_words_sep
 
@@ -1589,6 +1657,11 @@ class Rufo::Formatter
     # [:assoc_new, key, value]
     _, key, value = node
 
+    # If a symbol comes it means it's something like
+    # `:foo => 1` or `:"foo" => 1` and a `=>`
+    # always follows
+    symbol = current_token_kind == :on_symbeg
+
     visit key
 
     skip_space_or_newline
@@ -1597,7 +1670,8 @@ class Rufo::Formatter
     track_hash_key
 
     # Don't output `=>` for keys that are `label: value`
-    unless key[0] == :@label
+    # or `"label": value`
+    if symbol || !(key[0] == :@label || key[0] == :dyna_symbol)
       consume_op "=>"
       skip_space_or_newline
       write_space " "
@@ -2288,6 +2362,13 @@ class Rufo::Formatter
         # Ignore spaces
         next_token
       when :on_nl, :on_ignored_nl
+        # I don't know why but sometimes a on_ignored_nl
+        # can appear with nil as the "text", and that's wrong
+        if current_token[2] == nil
+          next_token
+          next 
+        end
+
         if last == :newline
           # If we pass through consecutive newlines, don't print them
           # yet, but remember this fact
@@ -2525,17 +2606,23 @@ class Rufo::Formatter
     i == array.size - 1
   end
 
-  def push_call(call)
-    old_call      = @current_call
-    @current_call = call
-
-    # A call can specify hash arguments so it acts as a
-    # hash for key alignment purposes
-    push_hash(call) do
-      yield
+  def push_call(node)
+    push_node(node) do
+      # A call can specify hash arguments so it acts as a
+      # hash for key alignment purposes
+      push_hash(node) do
+        yield
+      end
     end
+  end
+
+  def push_node(node)
+    old_node      = @current_node
+    @current_node = node
+
+    yield
 
-    @current_call = old_call
+    @current_node = old_node
   end
 
   def push_hash(node)

data/lib/rufo/version.rb

@@ -1,3 +1,3 @@
 module Rufo
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

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