rufo 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b4f9efa0b1ba8d9770f669de9facdb1b8b94d69
-  data.tar.gz: d851a347f0ca90587d9dc4575dd8a8e62f3e1105
+  metadata.gz: 5977c3bee92952a7125dfe7f6bc7dc64d9baa994
+  data.tar.gz: 1abb73ee81dfa60272c6244d246a224ff9129ddb
 SHA512:
-  metadata.gz: 8b82667aad953010424caba2aa78c61234262932b9b3bfeee74c8ad6957c247f2911a8998b21e2ef1f65c4c18d87947310dab59f1ec057d69efbb174c18804e2
-  data.tar.gz: b430c54354544cd27f46cd11d873fc172f8dbc8d9be5c37dc6cd4a1875c8e72736945f44acf71e866c92f7b8368036d572a5d8b79fcfe0c7b9e43d87bb099fea
+  metadata.gz: 5bb6a4ad522968388e50eaf6daa9257bc38f7d2b39864f78dd19127afdd0507afc0f6fead7023c971f045ab3207ae184f1494f134f006d6189ec2fae85a531ea
+  data.tar.gz: cfeb8c85246bc916f57e311583df9bdf1c22770a70f7019cf80b2a1f6945ef067ba4f90d03aa069f31d3dfa75abb71f1b17ef171d086ebfdafb9926c7aa1be3d

data/lib/rufo/formatter.rb

@@ -170,6 +170,9 @@ class Rufo::Formatter
     when :@ivar
       # [:@ivar, "@foo", [1, 0]]
       consume_token :on_ivar
+    when :@cvar
+      # [:@cvar, "@@foo", [1, 0]]
+      consume_token :on_cvar
     when :@const
       # [:@const, "FOO", [1, 0]]
       consume_token :on_const
@@ -181,8 +184,14 @@ class Rufo::Formatter
       consume_op "::"
       skip_space_or_newline
       visit node[1]
+    when :top_const_field
+      # [:top_const_field, [:@const, "Foo", [1, 2]]]
+      consume_op "::"
+      visit node[1]
     when :const_path_ref
       visit_path(node)
+    when :const_path_field
+      visit_path(node)
     when :assign
       visit_assign(node)
     when :opassign
@@ -812,13 +821,7 @@ class Rufo::Formatter
 
   def visit_command_end(node, args)
     push_call(node) do
-      indent(@column) do
-        if args[0].is_a?(Symbol)
-          visit args
-        else
-          visit_exps args, false, false
-        end
-      end
+      visit_command_args(args)
     end
 
     check_heredocs_at_call_end(node)
@@ -869,15 +872,23 @@ class Rufo::Formatter
     visit name
     consume_space
 
-    indent(@column) do
-      visit args
-    end
+    visit_command_args(args)
 
     # Only set it after we visit the call after the dot,
     # so we remember the outmost dot position
     @dot_column = dot_column
   end
 
+  def visit_command_args(args)
+    indent(@column) do
+      if args[0].is_a?(Symbol)
+        visit args
+      else
+        visit_exps args, false, false
+      end
+    end
+  end
+
   def visit_call_with_block(node)
     # [:method_add_block, call, block]
     _, call, block = node
@@ -1100,8 +1111,10 @@ class Rufo::Formatter
     if final_exp
       nodes = [*node[1], node[2]]
       visit_comma_separated_list(nodes)
-    else
+    elsif exps[0].is_a?(Symbol)
       visit exps
+    else
+      visit_exps exps, false, false
     end
   end
 
@@ -1587,9 +1600,7 @@ class Rufo::Formatter
           visit elem
         end
 
-        unless last?(i, elements)
-          check :on_words_sep
-
+        if !last?(i, elements) && current_token_kind == :on_words_sep
           # On a newline, write line and indent
           if current_token_value.include?("\n")
             next_token
@@ -2424,6 +2435,12 @@ class Rufo::Formatter
         next_token
         last            = :comment
         multilple_lines = false
+      when :on_embdoc_beg
+        write_line if multilple_lines
+
+        consume_embedded_comment
+        last = :comment
+        last_comment_has_newline = true
       else
         break
       end
@@ -2440,6 +2457,19 @@ class Rufo::Formatter
     end
   end
 
+  def consume_embedded_comment
+    write current_token_value
+    next_token
+
+    while current_token_kind != :on_embdoc_end
+      write current_token_value
+      next_token
+    end
+
+    write current_token_value.rstrip
+    next_token
+  end
+
   def indent(value = nil)
     if value
       old_indent = @indent

data/lib/rufo/version.rb

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

metadata

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