rufo 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 447a4661f121c8ffd43ba8fc6e5e7267ab5dc3d5
-  data.tar.gz: a69acf6a569e48b611a51d6105bc3081b47742fe
+  metadata.gz: 4dee48483405a03bf26d15795f7d17aec4859813
+  data.tar.gz: 2003268779c62c5ba28066b176112baec2200aff
 SHA512:
-  metadata.gz: 9e0df262618cf4ff4e6b6b4ddd9b241b734e52a2fe35c170ee70c4dbabc7d48df15e39c9432574982886dc19631a7263fb0d53f00e7deb45e50d7173fbe75275
-  data.tar.gz: 1aaf628a9c1ee5d2405b518048d1ae1524d5f673798c511751675cfe38680041619286f0e5056e59c81cc4deabb5e39f54775b87af31f041a8c65119b79befb4
+  metadata.gz: c1199060cc3e550ab376e758d04605692dd25c295a67dc329d214a0d6055ee8eac43e6812e8b75ebcfa2021a5f8a06e31d3c06975be8ecb100867e0f30984cc9
+  data.tar.gz: '093f40f565a3d9c229ad7e467e5ba82a170844444cbdaf0d5d02795df65a1a2c9041fe7e95bb7191454bdd2895e5f1c5d2abb267df15b7aa34be6b1a5a271f77'

data/README.md

@@ -79,7 +79,7 @@ issue if you need something else to be configurable.
 
 ## Status
 
-The current version is 0.0.3. The formatter was tested on some big files with many Ruby
+The formatter was tested on some big files with many Ruby
 syntax and idioms, but since it's so new there might be some missing stuff. Don't hesitate
 to open an issue if you find something is not working well. In any case, if the formatter
 chokes on some valid input you will get an error prompting you to submit a bug report here :-)

data/lib/rufo/formatter.rb

@@ -1121,11 +1121,17 @@ class Rufo::Formatter
 
   def visit_unary(node)
     # [:unary, :-@, [:vcall, [:@ident, "x", [1, 2]]]]
-    check :on_op
-    write current_token_value
-    next_token
-    skip_space_or_newline
-    visit node[2]
+    _, op, exp = node
+
+    consume_op_or_keyword op
+
+    if op == :not
+      consume_space 
+    else
+      skip_space_or_newline
+    end
+    
+    visit exp
   end
 
   def visit_binary(node)
@@ -1140,12 +1146,20 @@ class Rufo::Formatter
     end
     skip_space
     write_space " " if needs_space
-    check :on_op
-    write current_token_value
-    next_token
+    consume_op_or_keyword op
     indent_after_space right, false, needs_space
   end
 
+  def consume_op_or_keyword(op)
+    case current_token_kind
+    when :on_op, :on_kw
+      write current_token_value
+      next_token
+    else
+      bug "Expected op or kw, not #{current_token_kind}"
+    end
+  end
+
   def visit_class(node)
     # [:class,
     #   name
@@ -1413,7 +1427,8 @@ class Rufo::Formatter
     # [:array, elements]
 
     # Check if it's `%w(...)` or `%i(...)`
-    if current_token_kind == :on_qwords_beg || current_token_kind == :on_qsymbols_beg
+    case current_token_kind
+    when :on_qwords_beg, :on_qsymbols_beg, :on_words_beg, :on_symbols_beg
       visit_q_or_i_array(node)
       return
     end
@@ -1443,6 +1458,12 @@ class Rufo::Formatter
   def visit_q_or_i_array(node)
     _, elements = node
 
+    # 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)
+    end
+
     write current_token_value.strip
 
     # If there's a newline after `%w(`, write line and indent

data/lib/rufo/version.rb

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

metadata

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