rufo 0.0.29 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5d988295293486aedb59809e856de442d3e7643
-  data.tar.gz: 8429b9a9e9c0261736946f31564aed9f85618c91
+  metadata.gz: 3d993ab0deff7da557c3e35bac8271ad6c60d43c
+  data.tar.gz: 669c9785a3ef39403dc0b6746ad0e5c8c7196e15
 SHA512:
-  metadata.gz: 4fe7de7ca53140f7b02fda1d5bdc9ad8cf448f448f60c969479f9e8427b96585a7dc7094f816fe3450f21f591bdea88f2c162670a906f0a13eda2b38f9388327
-  data.tar.gz: 1dc130a6f8708862eb9a4ded52459607579a1f431e77758f2e1d2266a50d6563e8e3fe52b0b8110c4e8508014107b7624ab49cb24a1fa8861d937abc03ff461f
+  metadata.gz: e6bcf974f8c95767a9a70a1f24acad264d6facb5040e466709a3b15fcfc11f5ecf8c0de1f8cbf02d9b34e051f0487711ad7f79639b9908a6cff99207dc4f2e19
+  data.tar.gz: 0e2f04958a659060263e4e1dfa15748e2b70bbce178f91db46a278aeec5cc8671ed207ec3b053aee609edbc5881bba78b313bc431925826c82e7081351e621c2

data/lib/rufo/formatter.rb

@@ -26,6 +26,9 @@ class Rufo::Formatter
     # calls to that dot
     @dot_column = nil
 
+    # Did this line already set the `@dot_column` variable?
+    @line_has_dot_column = nil
+
     # The column of a `obj.method` call, but only the name part,
     # so we can also align arguments accordingly
     @name_dot_column = nil
@@ -103,16 +106,16 @@ class Rufo::Formatter
     @case_when_positions = []
 
     # Settings
-    indent_size options.fetch(:indent_size, 2)
-    space_after_hash_brace options.fetch(:space_after_hash_brace, :dynamic)
+    indent_size               options.fetch(:indent_size, 2)
+    space_after_hash_brace    options.fetch(:space_after_hash_brace, :dynamic)
     space_after_array_bracket options.fetch(:space_after_array_bracket, :never)
-    align_comments options.fetch(:align_comments, true)
-    align_assignments options.fetch(:align_assignments, false)
-    align_hash_keys options.fetch(:align_hash_keys, true)
-    align_case_when options.fetch(:align_case_when, true)
-    align_chained_calls options.fetch(:align_chained_calls, true)
-    preserve_whitespace options.fetch(:preserve_whitespace, true)
-    trailing_commas options.fetch(:trailing_commas, :always)
+    align_comments            options.fetch(:align_comments, true)
+    align_assignments         options.fetch(:align_assignments, false)
+    align_hash_keys           options.fetch(:align_hash_keys, true)
+    align_case_when           options.fetch(:align_case_when, true)
+    align_chained_calls       options.fetch(:align_chained_calls, true)
+    preserve_whitespace       options.fetch(:preserve_whitespace, true)
+    trailing_commas           options.fetch(:trailing_commas, :always)
   end
 
   # The indent size (default: 2)
@@ -906,8 +909,9 @@ class Rufo::Formatter
       end
     end
 
-    # Remember dot column
-    dot_column = @column
+    # Remember dot column, but only if there isn't one already set
+    dot_column = @column unless @dot_column
+
     consume_call_dot
 
     skip_space
@@ -927,7 +931,7 @@ class Rufo::Formatter
 
     # Only set it after we visit the call after the dot,
     # so we remember the outmost dot position
-    @dot_column = dot_column
+    @dot_column = dot_column if dot_column
   end
 
   def consume_call_dot
@@ -983,6 +987,18 @@ class Rufo::Formatter
         call_info << true
       end
 
+      want_trailing_comma = true
+
+      # Check if there's a block arg and if the call ends with hash key/values
+      if args_node[0] == :args_add_block
+        _, args, block_arg = args_node
+        want_trailing_comma = !block_arg
+        if args.is_a?(Array) && (last_arg = args.last) && last_arg.is_a?(Array) &&
+           last_arg[0].is_a?(Symbol) && last_arg[0] != :bare_assoc_hash
+          want_trailing_comma = false
+        end
+      end
+
       push_call(node) do
         visit args_node
         skip_space
@@ -992,7 +1008,7 @@ class Rufo::Formatter
 
       if found_comma
         if needs_trailing_newline
-          write "," if @trailing_commas != :never
+          write "," if @trailing_commas != :never && !block_arg
 
           next_token
           indent(next_indent) do
@@ -1007,7 +1023,7 @@ class Rufo::Formatter
 
       if newline? || comment?
         if needs_trailing_newline
-          write "," if @trailing_commas == :always
+          write "," if @trailing_commas == :always && want_trailing_comma
 
           indent(next_indent) do
             consume_end_of_line
@@ -1018,7 +1034,7 @@ class Rufo::Formatter
         end
       else
         if needs_trailing_newline && !found_comma
-          write "," if @trailing_commas == :always
+          write "," if @trailing_commas == :always && want_trailing_comma
           consume_end_of_line
           write_indent
         end
@@ -1314,9 +1330,15 @@ class Rufo::Formatter
 
     if block_arg
       skip_space_or_newline
-      write_params_comma if comma?
+
+      if comma?
+        indent(next_indent) do
+          write_params_comma
+        end
+      end
 
       consume_op "&"
+      skip_space_or_newline
       visit block_arg
     end
   end
@@ -1630,6 +1652,21 @@ class Rufo::Formatter
     # [:binary, left, op, right]
     _, left, op, right = node
 
+    # If this binary is not at the beginning of a line, if there's
+    # a newline following the op we want to align it with the left
+    # value. So for example:
+    #
+    # var = left_exp ||
+    #       right_exp
+    #
+    # But:
+    #
+    # def foo
+    #   left_exp ||
+    #     right_exp
+    # end
+    needed_indent = @column == @indent ? next_indent : @column
+
     visit left
     if space?
       needs_space = true
@@ -1650,7 +1687,7 @@ class Rufo::Formatter
     end
 
     consume_op_or_keyword op
-    indent_after_space right, want_space: needs_space
+    indent_after_space right, want_space: needs_space, needed_indent: needed_indent
   end
 
   def consume_op_or_keyword(op)
@@ -1757,6 +1794,11 @@ class Rufo::Formatter
         check :on_rparen
         next_token
         skip_space
+
+        # () needs to be preserved if some content follows
+        unless newline? || comment?
+          write "()"
+        end
       else
         write "("
 
@@ -1976,6 +2018,7 @@ class Rufo::Formatter
 
     if elements && !elements.empty?
       write_space if has_space
+      column = @column
 
       elements.each_with_index do |elem, i|
         if elem[0] == :@tstring_content
@@ -1991,7 +2034,7 @@ class Rufo::Formatter
           if current_token_value.include?("\n")
             next_token
             write_line
-            write_indent(next_indent)
+            write_indent(column)
           else
             next_token
             write_space
@@ -2894,8 +2937,8 @@ class Rufo::Formatter
           # # that continues here
           # ```
           if last_comment &&
-            last_comment[0][0] + 1 == current_token[0][0] &&
-            last_comment[0][1] == current_token[0][1]
+             last_comment[0][0] + 1 == current_token[0][0] &&
+             last_comment[0][1] == current_token[0][1]
             write_indent(last_comment_column)
             track_comment
           else
@@ -2947,8 +2990,8 @@ class Rufo::Formatter
     # or the last thing was a comment (from which we removed the newline)
     # or we just passed multiple lines (but printed only one)
     if (!found_newline && !at_prefix && !(want_semicolon && last == :semicolon)) ||
-      last == :comment ||
-      (multilple_lines && want_multiline)
+       last == :comment ||
+       (multilple_lines && want_multiline)
       write_line
     end
   end
@@ -3100,13 +3143,13 @@ class Rufo::Formatter
     @last_was_newline = false
   end
 
-  def indent_after_space(node, sticky: false, want_space: true, first_space: nil)
+  def indent_after_space(node, sticky: false, want_space: true, first_space: nil, needed_indent: next_indent)
     first_space = current_token if space?
 
     skip_space
     case current_token_kind
     when :on_ignored_nl, :on_comment
-      indent do
+      indent(needed_indent) do
         consume_end_of_line
         write_indent
         visit node

data/lib/rufo/version.rb

@@ -1,3 +1,3 @@
 module Rufo
-  VERSION = "0.0.29"
+  VERSION = "0.0.30"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rufo
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.30
 platform: ruby
 authors:
 - Ary Borenszweig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-28 00:00:00.000000000 Z
+date: 2017-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler