rufo 0.0.31 → 0.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 208020c1cfc4ae639637febda545a3c3752980fe
-  data.tar.gz: 17da5ed34f7765ff9e08daa305965e41c568a6ac
+  metadata.gz: 567434311fc51fc2df58435a9b746c8bceb677b6
+  data.tar.gz: 952b5fde3de3a1a1613b80da0f2b77a1bbf08883
 SHA512:
-  metadata.gz: 696a53c1d4d30504a01c677fe87f54db384c68c8e8e38f510184c7bd2fd1bb4e9b18a04171b75318f722356bdcca93eef28e96feafb21d403336b0432d2821cc
-  data.tar.gz: a5783f444cb5b20a2ef8d0b8eadd4a7e62502f4782e98bf5938ac484d6abbeda167384749a47b81ca10949c548e737a967706b420f64424225f94180bc753fb6
+  metadata.gz: c2922786da9e59ad5077d32fbe48b233416bf44d8c8e8719a02d73731ced2158f9051fb3e8fff8d1090d91d647e87e0b29cee7e58c8abcc73dcdc9fcdca239d4
+  data.tar.gz: 2c535a76bb09f8af19f0582873b58dab19b66d3fda4d784ad4dfc1e86dcf29539bd7f938ad0a0d916446e1ab18c67545e1d641bf186bbc2f72db324936c6bc62

data/README.md

@@ -84,7 +84,7 @@ available configurations:
 # * :dynamic: if there's a space, keep it. If not, don't add it
 # * :always: always put a space after an array bracket (default)
 # * :never: never put a space after an array bracket
-space_after_array_bracket :never
+space_after_array_bracket :dynamic
 
 # Whether to put a space after a hash brace. Valid values are:
 #
@@ -93,20 +93,20 @@ space_after_array_bracket :never
 # * :never: never put a space after a hash brace
 space_after_hash_brace :dynamic
 
-# Whether to align successive comments (default: true)
-align_comments true
+# Whether to align successive comments (default: false)
+align_comments false
 
 # Whether to align successive assignments (default: false)
 align_assignments false
 
-# Whether to align successive hash keys (default: true)
-align_hash_keys true
+# Whether to align successive hash keys (default: false)
+align_hash_keys false
 
-# Whether to align successive case when (default: true)
-align_case_when true
+# Whether to align successive case when (default: false)
+align_case_when false
 
-# Whether to align chained calls to the dot (default: true)
-align_chained_calls true
+# Whether to align chained calls to the first dot in the first line (default: false)
+align_chained_calls false
 
 # Preserve whitespace after assignments target and values,
 # after calls that start with a space, hash arrows and commas (default: true).
@@ -116,6 +116,12 @@ align_chained_calls true
 #
 # If `align_assignments` is true, this doesn't apply to assignments.
 # If `align_hash_keys` is true, this doesn't apply to hash keys.
+#
+#
+# Can also be set to `:YES` to preserve whitespace in many more places,
+# in case there's no clear rule in your workplace/project as to when
+# to leave spaces or not. This includes spaces (or the absence of them)
+# around dots, braces, pipes and hash keys and values.
 preserve_whitespace true
 
 # The indent size (default: 2)
@@ -123,10 +129,10 @@ indent_size 2
 
 # Whether to place commas at the end of a multi-line list
 #
-# * :dynamic: if there's a comma, keep it. If not, don't add it
-# * :always: always put a comma (default)
+# * :dynamic: if there's a comma, keep it. If not, don't add it (default)
+# * :always: always put a comma
 # * :never: never put a comma
-trailing_commas :always
+trailing_commas :dyanmic
 ```
 
 As time passes there might be more configurations available. Please open an

data/lib/rufo/formatter.rb

@@ -26,6 +26,10 @@ class Rufo::Formatter
     # calls to that dot
     @dot_column = nil
 
+    # Same as above, but the column of the original dot, not
+    # the one we finally wrote
+    @original_dot_column = nil
+
     # Did this line already set the `@dot_column` variable?
     @line_has_dot_column = nil
 
@@ -68,6 +72,28 @@ class Rufo::Formatter
     # However, for these cases it's better to not align it like that.
     @line_to_call_info = {}
 
+    # Lists [first_line, last_line, indent] of lines that need an indent because
+    # of alignment of literals. For example this:#
+    #
+    #     foo [
+    #           1,
+    #         ]
+    #
+    # is normally formatted to:
+    #
+    #     foo [
+    #       1,
+    #     ]
+    #
+    # However, if it's already formatted like the above we preserve it.
+    @literal_indents = []
+
+    # First non-space token in this line
+    @first_token_in_line = nil
+
+    # Do we want to compute the above?
+    @want_first_token_in_line = false
+
     # Each line that belongs to a heredoc content is put here
     @heredoc_lines = {}
 
@@ -114,14 +140,14 @@ class Rufo::Formatter
     # Settings
     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)
+    space_after_array_bracket options.fetch(:space_after_array_bracket, :dynamic)
+    align_comments            options.fetch(:align_comments, false)
     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)
+    align_hash_keys           options.fetch(:align_hash_keys, false)
+    align_case_when           options.fetch(:align_case_when, false)
+    align_chained_calls       options.fetch(:align_chained_calls, false)
     preserve_whitespace       options.fetch(:preserve_whitespace, true)
-    trailing_commas           options.fetch(:trailing_commas, :always)
+    trailing_commas           options.fetch(:trailing_commas, :dynamic)
   end
 
   # The indent size (default: 2)
@@ -145,9 +171,9 @@ class Rufo::Formatter
 
   # Whether to put a space after an array bracket. Valid values are:
   #
-  # * :dynamic: if there's a space, keep it. If not, don't keep it
+  # * :dynamic: if there's a space, keep it. If not, don't keep it (default)
   # * :always: always put a space after an array bracket
-  # * :never: never put a space after an array bracket (default)
+  # * :never: never put a space after an array bracket
   def space_after_array_bracket(value)
     case value
     when :dynamic, :always, :never
@@ -157,7 +183,7 @@ class Rufo::Formatter
     end
   end
 
-  # Whether to align successive comments (default: true)
+  # Whether to align successive comments (default: false)
   def align_comments(value)
     @align_comments = value
   end
@@ -167,17 +193,17 @@ class Rufo::Formatter
     @align_assignments = value
   end
 
-  # Whether to align successive hash keys (default: true)
+  # Whether to align successive hash keys (default: false)
   def align_hash_keys(value)
     @align_hash_keys = value
   end
 
-  # Whether to align successive case when (default: true)
+  # Whether to align successive case when (default: false)
   def align_case_when(value)
     @align_case_when = value
   end
 
-  # Whether to align chained calls to the dot (default: true)
+  # Whether to align chained calls to the first dot in the first line (default: false)
   def align_chained_calls(value)
     @align_chained_calls = value
   end
@@ -190,14 +216,19 @@ class Rufo::Formatter
   #
   # If `align_assignments` is true, this doesn't apply to assignments.
   # If `align_hash_keys` is true, this doesn't apply to hash keys.
+  #
+  # Can also be set to `:YES` to preserve whitespace in many more places,
+  # in case there's no clear rule in your workplace/project as to when
+  # to leave spaces or not. This includes spaces (or the absence of them)
+  # around dots, braces, pipes and hash keys and values.
   def preserve_whitespace(value)
     @preserve_whitespace = value
   end
 
   # Whether to place commas at the end of a multi-line list
   #
-  # * :dynamic: if there's a comma, keep it. If not, don't add it
-  # * :always: always put a comma (default)
+  # * :dynamic: if there's a comma, keep it. If not, don't add it (default)
+  # * :always: always put a comma
   # * :never: never put a comma
   def trailing_commas(value)
     case value
@@ -215,6 +246,7 @@ class Rufo::Formatter
     @output.chomp! if @output.end_with?("\n\n")
 
     dedent_calls
+    indent_literals
     do_align_assignments if @align_assignments
     do_align_hash_keys if @align_hash_keys
     do_align_case_when if @align_case_when
@@ -806,8 +838,8 @@ class Rufo::Formatter
 
   def current_comment_aligned_to_previous_one?
     @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_line &&
+      @last_comment[0][1] == current_token_column
   end
 
   def track_comment(id: nil, match_previous_id: false)
@@ -912,25 +944,36 @@ class Rufo::Formatter
     @dot_column = nil
     visit obj
 
+    first_space = current_token if space? && @preserve_whitespace == :YES
     skip_space
 
     if newline? || comment?
       consume_end_of_line
 
-      if @align_chained_calls
+      # If align_chained_calls if off, we still want to preserve alignment if it's already there
+      if @align_chained_calls || (@original_dot_column && @original_dot_column == current_token_column)
         @name_dot_column = @dot_column || next_indent
         write_indent(@dot_column || next_indent)
       else
+        # Make sure to reset dot_column so next lines don't align to the first dot
+        @dot_column = next_indent
         @name_dot_column = next_indent
         write_indent(next_indent)
       end
+    elsif first_space
+      write_space first_space[2]
     end
 
     # Remember dot column, but only if there isn't one already set
-    dot_column = @column unless @dot_column
+    unless @dot_column
+      dot_column = @column
+      original_dot_column = current_token_column
+    end
 
     consume_call_dot
 
+    first_space = nil
+    first_space = current_token if space? && @preserve_whitespace == :YES
     skip_space
 
     if newline? || comment?
@@ -938,6 +981,9 @@ class Rufo::Formatter
       write_indent(next_indent)
     else
       skip_space_or_newline
+      if first_space
+        write_space first_space[2]
+      end
     end
 
     if name == :call
@@ -949,6 +995,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 if dot_column
+    @original_dot_column = original_dot_column if original_dot_column
   end
 
   def consume_call_dot
@@ -975,6 +1022,8 @@ class Rufo::Formatter
 
     # Remember dot column so it's not affected by args
     dot_column = @dot_column
+    original_dot_column = @original_dot_column
+
     want_indent = @name_dot_column && @name_dot_column > @indent
 
     maybe_indent(want_indent, @name_dot_column) do
@@ -983,6 +1032,7 @@ class Rufo::Formatter
 
     # Restore dot column so it's not affected by args
     @dot_column = dot_column
+    @original_dot_column = original_dot_column
   end
 
   def visit_call_at_paren(node, args)
@@ -1060,7 +1110,11 @@ class Rufo::Formatter
       skip_space_or_newline
     end
 
-    call_info << @line if call_info
+    # If the closing parentheses matches the indent of the first parameter,
+    # keep it like that. Otherwise dedent.
+    if call_info && call_info[1] != current_token_column
+      call_info << @line
+    end
 
     consume_token :on_rparen
   end
@@ -1071,17 +1125,19 @@ class Rufo::Formatter
     # [:command, name, args]
     _, name, args = node
 
+    base_column = current_token_column
+
     push_call(node) do
       visit name
       consume_space_after_command_name
     end
 
-    visit_command_end(node, args)
+    visit_command_end(node, args, base_column)
   end
 
-  def visit_command_end(node, args)
+  def visit_command_end(node, args, base_column)
     push_call(node) do
-      visit_command_args(args)
+      visit_command_args(args, base_column)
     end
   end
 
@@ -1117,11 +1173,19 @@ class Rufo::Formatter
     #   [:args_add_block, [[:@int, "1", [1, 8]]], block]]
     _, receiver, dot, name, args = node
 
+    base_column = current_token_column
+
     visit receiver
+
+    first_space = current_token if space? && @preserve_whitespace == :YES
+
+    line = @line
     skip_space_or_newline
 
     # Remember dot column
     dot_column = @column
+    original_dot_column = @original_dot_column
+
     consume_call_dot
 
     skip_space
@@ -1135,11 +1199,12 @@ class Rufo::Formatter
 
     visit name
     consume_space_after_command_name
-    visit_command_args(args)
+    visit_command_args(args, base_column)
 
     # Only set it after we visit the call after the dot,
     # so we remember the outmost dot position
     @dot_column = dot_column
+    @original_dot_column = original_dot_column
   end
 
   def consume_space_after_command_name
@@ -1156,8 +1221,10 @@ class Rufo::Formatter
     end
   end
 
-  def visit_command_args(args)
+  def visit_command_args(args, base_column)
     needed_indent = @column
+    args_is_def_class_or_module = false
+    param_column = current_token_column
 
     # Check if there's a single argument and it's
     # a def, class or module. In that case we don't
@@ -1171,11 +1238,13 @@ class Rufo::Formatter
           case first[0]
           when :def, :class, :module
             needed_indent = @indent
+            args_is_def_class_or_module = true
           end
         end
       end
     end
 
+    base_line = @line
     call_info = @line_to_call_info[@line]
     if call_info
       call_info = nil
@@ -1184,6 +1253,10 @@ class Rufo::Formatter
       @line_to_call_info[@line] = call_info
     end
 
+    old_want_first_token_in_line = @want_first_token_in_line
+    @want_first_token_in_line = true
+
+    # We align call parameters to the first paramter
     indent(needed_indent) do
       if args[0].is_a?(Symbol)
         visit args
@@ -1193,8 +1266,35 @@ class Rufo::Formatter
     end
 
     if call_info && call_info.size > 2
+      # A call like:
+      #
+      #     foo, 1, [
+      #       2,
+      #     ]
+      #
+      # would normally be aligned like this (with the first parameter):
+      #
+      #     foo, 1, [
+      #            2,
+      #          ]
+      #
+      # However, the first style is valid too and we preserve it if it's
+      # already formatted like that.
       call_info << @line
+    elsif !args_is_def_class_or_module && @first_token_in_line && param_column == @first_token_in_line[0][1]
+      # If the last line of the call is aligned with the first parameter, leave it like that:
+      #
+      #     foo 1,
+      #         2
+    elsif !args_is_def_class_or_module && @first_token_in_line && base_column + @indent_size == @first_token_in_line[0][1]
+      # Otherwise, align it just by two spaces (so we need to dedent, we fake a dedent here)
+      #
+      #     foo 1,
+      #       2
+      @line_to_call_info[base_line] = [0, needed_indent - next_indent, true, @line, @line]
     end
+
+    @want_first_token_in_line = old_want_first_token_in_line
   end
 
   def visit_call_with_block(node)
@@ -1203,7 +1303,16 @@ class Rufo::Formatter
 
     visit call
 
-    consume_space
+    if block[0] == :brace_block
+      if space? || !@preserve_whitespace
+        consume_space
+      else
+        consume_space unless @preserve_whitespace == :YES
+      end
+    else
+      consume_space
+    end
+
     visit block
   end
 
@@ -1227,14 +1336,14 @@ class Rufo::Formatter
     closing_brace_token, index = find_closing_brace_token
 
     # If the whole block fits into a single line, use braces
-    if current_token[0][0] == closing_brace_token[0][0]
+    if current_token_line == closing_brace_token[0][0]
       consume_token :on_lbrace
 
       consume_block_args args
 
-      consume_space
+      consume_space unless !space? && @preserve_whitespace == :YES
       visit_exps body, with_lines: false
-      consume_space
+      consume_space unless !space? && @preserve_whitespace == :YES
 
       consume_token :on_rbrace
       return
@@ -1251,7 +1360,11 @@ class Rufo::Formatter
     indent_body body, force_multiline: true
     write_indent
 
-    call_info << @line if call_info
+    # If the closing bracket matches the indent of the first parameter,
+    # keep it like that. Otherwise dedent.
+    if call_info && call_info[1] != current_token_column
+      call_info << @line
+    end
 
     consume_token :on_rbrace
   end
@@ -1274,7 +1387,15 @@ class Rufo::Formatter
 
   def consume_block_args(args)
     if args
-      consume_space
+      if space?
+        consume_space(want_preserve_whitespace: @preserve_whitespace == :YES)
+      else
+        if @preserve_whitespace == :YES
+          skip_space
+        else
+          consume_space
+        end
+      end
       # + 1 because of |...|
       #                ^
       indent(@column + 1) do
@@ -1574,7 +1695,7 @@ class Rufo::Formatter
 
     # If the whole block fits into a single line, format
     # in a single line
-    if current_token[0][0] == closing_brace_token[0][0]
+    if current_token_line == closing_brace_token[0][0]
       consume_token :on_lbrace
       consume_space
       visit_exps body, with_lines: false
@@ -1646,8 +1767,19 @@ class Rufo::Formatter
     _, before, star, after = node
 
     if before && !before.empty?
-      visit_comma_separated_list before
-      write_params_comma
+      # Maybe a Ripper bug, but if there's something before a star
+      # then a star shouldn't be here... but if it is... handle it
+      # somehow...
+      if current_token_kind == :on_op && current_token_value == "*"
+        before, star, after = nil, before, after
+      else
+        if before[0].is_a?(Symbol)
+          visit before
+        else
+          visit_comma_separated_list before
+        end
+        write_params_comma
+      end
     end
 
     consume_op "*"
@@ -1715,6 +1847,8 @@ class Rufo::Formatter
     #     right_exp
     # end
     needed_indent = @column == @indent ? next_indent : @column
+    base_column = @column
+    token_column = current_token_column
 
     visit left
     if space?
@@ -1736,7 +1870,7 @@ class Rufo::Formatter
     end
 
     consume_op_or_keyword op
-    indent_after_space right, want_space: needs_space, needed_indent: needed_indent
+    indent_after_space right, want_space: needs_space, needed_indent: needed_indent, token_column: token_column, base_column: base_column
   end
 
   def consume_op_or_keyword(op)
@@ -2024,6 +2158,8 @@ class Rufo::Formatter
 
     _, elements = node
 
+    token_column = current_token_column
+
     check :on_lbracket
     write "["
     next_token
@@ -2034,7 +2170,7 @@ class Rufo::Formatter
         visit elements
         skip_space_or_newline
       else
-        visit_literal_elements elements, inside_array: true
+        visit_literal_elements elements, inside_array: true, token_column: token_column
       end
     else
       skip_space_or_newline
@@ -2124,6 +2260,8 @@ class Rufo::Formatter
     # [:hash, elements]
     _, elements = node
 
+    token_column = current_token_column
+
     check :on_lbrace
     write "{"
     next_token
@@ -2131,7 +2269,7 @@ class Rufo::Formatter
     if elements
       # [:assoclist_from_args, elements]
       push_hash(node) do
-        visit_literal_elements(elements[1], inside_hash: true)
+        visit_literal_elements(elements[1], inside_hash: true, token_column: token_column)
       end
     else
       skip_space_or_newline
@@ -2156,7 +2294,9 @@ class Rufo::Formatter
 
     visit key
 
-    consume_space(want_preserve_whitespace: @preserve_whitespace)
+    unless @preserve_whitespace == :YES && !space? && !newline? && !comment?
+      consume_space(want_preserve_whitespace: @preserve_whitespace)
+    end
 
     track_hash_key
 
@@ -2164,7 +2304,10 @@ class Rufo::Formatter
     # or `"label": value`
     if arrow
       consume_op "=>"
-      consume_space(want_preserve_whitespace: !@align_hash_keys)
+
+      unless @preserve_whitespace == :YES && !space? && !newline? && !comment?
+        consume_space(want_preserve_whitespace: !@align_hash_keys)
+      end
     end
 
     visit value
@@ -2227,6 +2370,8 @@ class Rufo::Formatter
   def visit_array_getter_or_setter(name, args)
     visit name
 
+    token_column = current_token_column
+
     check :on_lbracket
     write "["
     next_token
@@ -2237,7 +2382,7 @@ class Rufo::Formatter
 
     # Sometimes args comes with an array...
     if args && args[0].is_a?(Array)
-      visit_literal_elements args
+      visit_literal_elements args, token_column: token_column
     else
       if newline? || comment?
         needed_indent = next_indent
@@ -2287,18 +2432,30 @@ class Rufo::Formatter
     _, receiver, dot, name = node
 
     @dot_column = nil
+    @original_dot_column = nil
+
     visit receiver
+
+    first_space = current_token if space? && @preserve_whitespace == :YES
+
     skip_space
 
     if newline? || comment?
       consume_end_of_line
 
       write_indent(@dot_column || next_indent)
+    elsif first_space
+      write_space first_space[2]
     end
 
     # Remember dot column
     dot_column = @column
+    original_dot_column = current_token_column
+
     consume_call_dot
+
+    first_space = nil
+    first_space = current_token if space? && @preserve_whitespace == :YES
     skip_space
 
     if newline? || comment?
@@ -2306,6 +2463,9 @@ class Rufo::Formatter
       write_indent(next_indent)
     else
       skip_space_or_newline
+      if first_space
+        write_space first_space[2]
+      end
     end
 
     visit name
@@ -2313,6 +2473,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
+    @original_dot_column = original_dot_column
   end
 
   def visit_return(node)
@@ -2394,12 +2555,12 @@ class Rufo::Formatter
       closing_brace_token, index = find_closing_brace_token
 
       # Check if the whole block fits into a single line
-      if current_token[0][0] == closing_brace_token[0][0]
+      if current_token_line == closing_brace_token[0][0]
         consume_token :on_tlambeg
 
-        consume_space
+        consume_space unless !space? && @preserve_whitespace == :YES
         visit_exps body, with_lines: false
-        consume_space
+        consume_space unless !space? && @preserve_whitespace == :YES
 
         consume_token :on_rbrace
         return
@@ -2425,11 +2586,13 @@ class Rufo::Formatter
     # [:super, args]
     _, args = node
 
+    base_column = current_token_column
+
     consume_keyword "super"
 
     if space?
       consume_space
-      visit_command_end node, args
+      visit_command_end node, args, base_column
     else
       visit_call_at_paren node, args
     end
@@ -2486,8 +2649,9 @@ class Rufo::Formatter
     visit_comma_separated_list exps
   end
 
-  def visit_literal_elements(elements, inside_hash: false, inside_array: false)
+  def visit_literal_elements(elements, inside_hash: false, inside_array: false, token_column:)
     base_column = @column
+    base_line = @line
     needs_final_space = (inside_hash || inside_array) && space?
     skip_space
 
@@ -2605,7 +2769,20 @@ class Rufo::Formatter
       end
     end
 
-    call_info << @line if call_info
+    if current_token_column == token_column && needed_indent < token_column
+      # If the closing token is aligned with the opening token, we want to
+      # keep it like that, for example in:
+      #
+      # foo([
+      #       2,
+      #     ])
+      @literal_indents << [base_line, @line, token_column + @indent_size - needed_indent]
+    elsif call_info && call_info[0] == current_token_column
+      # If the closing literal position matches the column where
+      # the call started, we want to preserve it like that
+      # (otherwise we align it to the first parameter)
+      call_info << @line
+    end
   end
 
   def check_heredocs_in_literal_elements(is_last, needs_trailing_comma, wrote_comma)
@@ -2718,11 +2895,16 @@ class Rufo::Formatter
     # [:when, conds, body, next_exp]
     _, conds, body, next_exp = node
 
+    preserve_whitespace = @preserve_whitespace && !@align_case_when
+
     consume_keyword "when"
-    consume_space
+    consume_space(want_preserve_whitespace: preserve_whitespace)
+
+    space_after_when = nil
 
     indent(@column) do
       visit_comma_separated_list conds
+      space_after_when = current_token if space? && preserve_whitespace
       skip_space
     end
 
@@ -2730,7 +2912,10 @@ class Rufo::Formatter
     inline = then_keyword || semicolon?
     if then_keyword
       next_token
+
+      space_after_then = current_token if space? && preserve_whitespace
       skip_space
+
       track_case_when
       skip_semicolons
 
@@ -2740,7 +2925,19 @@ class Rufo::Formatter
         # Cancel tracking of `case when ... then` on a nelwine.
         @case_when_positions.pop
       else
-        write " then "
+        if space_after_when
+          write_space space_after_when[2]
+        else
+          write_space
+        end
+
+        write "then"
+
+        if space_after_then
+          write_space space_after_then[2]
+        else
+          write_space
+        end
       end
     elsif semicolon?
       skip_semicolons
@@ -2913,11 +3110,12 @@ class Rufo::Formatter
   # - want_semicolon: do we want do print a semicolon to separate expressions?
   # - want_multiline: do we want multiple lines to appear, or at most one?
   def consume_end_of_line(at_prefix: false, want_semicolon: false, want_multiline: true, needs_two_lines_on_comment: false)
-    found_newline = false            # Did we find any newline during this method?
-    last = nil                       # Last token kind found
-    multilple_lines = false          # Did we pass through more than one newline?
-    last_comment_has_newline = false # Does the last comment has a newline?
-    newline_count = 0                # Number of newlines we passed
+    found_newline = false               # Did we find any newline during this method?
+    found_comment_after_newline = false # Did we find a comment after some newline?
+    last = nil                          # Last token kind found
+    multilple_lines = false             # Did we pass through more than one newline?
+    last_comment_has_newline = false    # Does the last comment has a newline?
+    newline_count = 0                   # Number of newlines we passed
 
     loop do
       case current_token_kind
@@ -2939,11 +3137,10 @@ class Rufo::Formatter
         else
           # If we just printed a comment that had a newline,
           # we must print two newlines because we remove newlines from comments (rstrip call)
+          write_line
           if last == :comment && last_comment_has_newline
-            write_line
             multilple_lines = true
           else
-            write_line
             multilple_lines = false
           end
         end
@@ -3053,6 +3250,7 @@ class Rufo::Formatter
         @last_comment_column = @column
         last_comment_has_newline = current_token_value.end_with?("\n")
         last = :comment
+        found_comment_after_newline = found_newline
         multilple_lines = false
 
         write current_token_value.rstrip
@@ -3074,7 +3272,7 @@ class Rufo::Formatter
     # 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)
+       (multilple_lines && (want_multiline || found_comment_after_newline))
       write_line
     end
   end
@@ -3095,7 +3293,7 @@ class Rufo::Formatter
   def consume_end
     return unless current_token_kind == :on___end__
 
-    line = current_token[0][0]
+    line = current_token_line
 
     write_line
     consume_token :on___end__
@@ -3225,7 +3423,7 @@ class Rufo::Formatter
     @column += indent
   end
 
-  def indent_after_space(node, sticky: false, want_space: true, first_space: nil, needed_indent: next_indent)
+  def indent_after_space(node, sticky: false, want_space: true, first_space: nil, needed_indent: next_indent, token_column: nil, base_column: nil)
     first_space = current_token if space?
 
     skip_space
@@ -3233,8 +3431,19 @@ class Rufo::Formatter
     when :on_ignored_nl, :on_comment
       indent(needed_indent) do
         consume_end_of_line
-        write_indent
-        visit node
+      end
+
+      if token_column && base_column && token_column == current_token_column
+        # If the expression is aligned with the one above, keep it like that
+        indent(base_column) do
+          write_indent
+          visit node
+        end
+      else
+        indent(needed_indent) do
+          write_indent
+          visit node
+        end
       end
     else
       if want_space
@@ -3283,6 +3492,14 @@ class Rufo::Formatter
     tok ? tok[2] : ""
   end
 
+  def current_token_line
+    current_token[0][0]
+  end
+
+  def current_token_column
+    current_token[0][1]
+  end
+
   def keyword?(kw)
     current_token_kind == :on_kw && current_token_value == kw
   end
@@ -3347,11 +3564,26 @@ class Rufo::Formatter
   end
 
   def next_token
+    prev_token = self.current_token
+
     @tokens.pop
 
     if (newline? || comment?) && !@heredocs.empty?
       flush_heredocs
     end
+
+    # First first token in newline if requested
+    if @want_first_token_in_line && prev_token && (prev_token[1] == :on_nl || prev_token[1] == :on_ignored_nl)
+      @tokens.reverse_each do |token|
+        case token[1]
+        when :on_sp
+          next
+        else
+          @first_token_in_line = token
+          break
+        end
+      end
+    end
   end
 
   def next_token_no_heredoc_check
@@ -3420,6 +3652,25 @@ class Rufo::Formatter
     @output = lines.join
   end
 
+  def indent_literals
+    return if @literal_indents.empty?
+
+    lines = @output.lines
+
+    @literal_indents.each do |first_line, last_line, indent|
+      (first_line + 1..last_line).each do |line|
+        next if @heredoc_lines[line]
+
+        current_line = lines[line]
+        current_line = "#{" " * indent}#{current_line}"
+        lines[line] = current_line
+        adjust_other_alignments nil, line, 0, indent
+      end
+    end
+
+    @output = lines.join
+  end
+
   def do_align_comments
     do_align @comments_positions, :comment
   end

data/lib/rufo/version.rb

@@ -1,3 +1,3 @@
 module Rufo
-  VERSION = "0.0.31"
+  VERSION = "0.0.32"
 end

metadata

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