rufo 0.0.28 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a6b866b774dad605890050d32a2b852c749cb59
-  data.tar.gz: 9e1cc07e01934c9a01160fa16430c739600d3333
+  metadata.gz: a5d988295293486aedb59809e856de442d3e7643
+  data.tar.gz: 8429b9a9e9c0261736946f31564aed9f85618c91
 SHA512:
-  metadata.gz: b931264262ffb38ba7eb7060c891342b2b6f7ed89625acb88842a6e5b51a99eeaaf9ead94b8e4ab0f8955c090847845b3b7ec62bdfca6615f35f378351027505
-  data.tar.gz: 5bdd8f74723a4af2fa7a5eab106f55899fa510a7987bc2afb7d93296245867fb57a3f95592b23cbe633b6b017594f67003ba17808ac3c5fa0064cbb523ca80d6
+  metadata.gz: 4fe7de7ca53140f7b02fda1d5bdc9ad8cf448f448f60c969479f9e8427b96585a7dc7094f816fe3450f21f591bdea88f2c162670a906f0a13eda2b38f9388327
+  data.tar.gz: 1dc130a6f8708862eb9a4ded52459607579a1f431e77758f2e1d2266a50d6563e8e3fe52b0b8110c4e8508014107b7624ab49cb24a1fa8861d937abc03ff461f

data/lib/rufo/formatter.rb

@@ -532,8 +532,18 @@ class Rufo::Formatter
         if !is_last && (exp_needs_two_lines || needs_two_lines?(exps[i + 1])) && @line <= line_before_endline + 1
           write_line
         end
-      else
-        skip_space_or_newline unless is_last
+      elsif !is_last
+        skip_space
+
+        has_semicolon = semicolon?
+        skip_semicolons
+        if newline?
+          write_line
+          write_indent(next_indent)
+        elsif has_semicolon
+          write "; "
+        end
+        skip_space_or_newline
       end
     end
   end
@@ -1170,7 +1180,11 @@ class Rufo::Formatter
     if void_exps?(body)
       consume_token :on_lbrace
       consume_block_args args
-      consume_space
+      if space?
+        consume_space
+      else
+        skip_space_or_newline
+      end
       consume_token :on_rbrace
       return
     end
@@ -1199,7 +1213,7 @@ class Rufo::Formatter
       call_info << true
     end
 
-    indent_body body
+    indent_body body, force_multiline: true
     write_indent
 
     call_info << @line if call_info
@@ -1211,13 +1225,15 @@ class Rufo::Formatter
     # [:brace_block, args, body]
     _, args, body = node
 
+    line = @line
+
     consume_keyword "do"
 
     consume_block_args args
 
     indent_body body
 
-    write_indent
+    write_indent if @line != line
     consume_keyword "end"
   end
 
@@ -1343,6 +1359,9 @@ class Rufo::Formatter
   def visit_bodystmt(node)
     # [:bodystmt, body, rescue_body, else_body, ensure_body]
     _, body, rescue_body, else_body, ensure_body = node
+
+    line = @line
+
     indent_body body
 
     while rescue_body
@@ -1385,7 +1404,7 @@ class Rufo::Formatter
       indent_body ensure_body[1]
     end
 
-    write_indent
+    write_indent if @line != line
     consume_keyword "end"
   end
 
@@ -1463,6 +1482,8 @@ class Rufo::Formatter
     #[:for, var, collection, body]
     _, var, collection, body = node
 
+    line = @line
+
     consume_keyword "for"
     consume_space
 
@@ -1478,10 +1499,9 @@ class Rufo::Formatter
     visit collection
     skip_space
 
-    next_token if keyword?("do")
-
     indent_body body
-    write_indent
+
+    write_indent if @line != line
     consume_keyword "end"
   end
 
@@ -1664,7 +1684,7 @@ class Rufo::Formatter
       visit superclass
     end
 
-    maybe_inline_body body
+    visit body
   end
 
   def visit_module(node)
@@ -1677,25 +1697,7 @@ class Rufo::Formatter
     skip_space_or_newline
     write_space
     visit name
-    maybe_inline_body body
-  end
-
-  def maybe_inline_body(body)
-    skip_space
-    if semicolon? && empty_body?(body)
-      next_token
-      skip_space
-      if newline?
-        skip_space_or_newline
-        visit body
-      else
-        write "; "
-        skip_space_or_newline
-        consume_keyword "end"
-      end
-    else
-      visit body
-    end
+    visit body
   end
 
   def visit_def(node)
@@ -1754,7 +1756,7 @@ class Rufo::Formatter
         skip_space_or_newline
         check :on_rparen
         next_token
-        skip_space_or_newline
+        skip_space
       else
         write "("
 
@@ -1780,7 +1782,7 @@ class Rufo::Formatter
       write "("
       visit params
       write ")"
-      skip_space_or_newline
+      skip_space
     end
 
     visit body
@@ -2058,16 +2060,17 @@ class Rufo::Formatter
     # `:foo => 1` or `:"foo" => 1` and a `=>`
     # always follows
     symbol = current_token_kind == :on_symbeg
+    arrow = symbol || !(key[0] == :@label || key[0] == :dyna_symbol)
 
     visit key
 
-    consume_space(want_preserve_whitespace: !@align_hash_keys)
+    consume_space(want_preserve_whitespace: @preserve_whitespace)
 
     track_hash_key
 
     # Don't output `=>` for keys that are `label: value`
     # or `"label": value`
-    if symbol || !(key[0] == :@label || key[0] == :dyna_symbol)
+    if arrow
       consume_op "=>"
       consume_space(want_preserve_whitespace: !@align_hash_keys)
     end
@@ -2310,7 +2313,7 @@ class Rufo::Formatter
       consume_keyword "do"
     end
 
-    indent_body body
+    indent_body body, force_multiline: true
 
     write_indent
 
@@ -2465,6 +2468,9 @@ class Rufo::Formatter
       # We have to be careful not to aumatically write a heredoc on next_token,
       # because we miss the chance to write a comma to separate elements
       next_token_no_heredoc_check
+
+      first_space = current_token if space?
+
       skip_space_no_heredoc_check
       wrote_comma = check_heredocs_in_literal_elements(is_last, needs_trailing_comma, wrote_comma)
 
@@ -2475,6 +2481,8 @@ class Rufo::Formatter
           consume_end_of_line
           write_indent(needed_indent)
         end
+      elsif !is_last && first_space && @preserve_whitespace
+        write_space first_space[2]
       else
         write_space unless is_last
       end
@@ -2533,17 +2541,13 @@ class Rufo::Formatter
     # end
     #
     # [:if, cond, then, else]
+    line = @line
+
     consume_keyword(keyword)
     consume_space
     visit node[1]
     skip_space
 
-    # Remove "then"
-    if keyword?("then")
-      next_token
-      skip_space
-    end
-
     indent_body node[2]
     if else_body = node[3]
       # [:else, else_contents]
@@ -2562,7 +2566,7 @@ class Rufo::Formatter
     end
 
     if check_end
-      write_indent
+      write_indent if @line != line
       consume_keyword "end"
     end
   end
@@ -2580,6 +2584,8 @@ class Rufo::Formatter
   def visit_while_or_until(node, keyword)
     _, cond, body = node
 
+    line = @line
+
     consume_keyword keyword
     consume_space
 
@@ -2587,49 +2593,9 @@ class Rufo::Formatter
 
     skip_space
 
-    # Keep `while cond; end` as is
-    semicolon = semicolon?
-    is_do = keyword?("do")
-
-    if (semicolon || is_do) && void_exps?(body)
-      next_token
-      skip_space
-
-      if keyword?("end")
-        if is_do
-          write " do end"
-        else
-          write "; end"
-        end
-        next_token
-        return
-      end
-    end
-
-    if semicolon || is_do
-      next_token
-      skip_space
-      skip_semicolons
-
-      if newline? || comment?
-        indent_body body
-        write_indent
-      else
-        skip_space_or_newline
-        if semicolon
-          write "; "
-        else
-          write " do "
-        end
-        visit_exps body, with_lines: false
-        skip_space_or_newline
-        write_space if is_do
-      end
-    else
-      indent_body body
-      write_indent
-    end
+    indent_body body
 
+    write_indent if @line != line
     consume_keyword "end"
   end
 
@@ -2857,6 +2823,8 @@ class Rufo::Formatter
     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
+    last_comment = nil               # Token for the last comment found
+    last_comment_column = nil        # Actual column of the last comment written
 
     loop do
       case current_token_kind
@@ -2909,7 +2877,30 @@ class Rufo::Formatter
           # Since we remove newlines from comments, we must add the last
           # one if it was a comment
           write_line
-          write_indent
+
+          # If the last comment is in the previous line and it was already
+          # aligned to this comment, keep it aligned. This is useful for
+          # this:
+          #
+          # ```
+          # a = 1 # some comment
+          #       # that continues here
+          # ```
+          #
+          # We want to preserve it like that and not change it to:
+          #
+          # ```
+          # a = 1 # some comment
+          # # that continues here
+          # ```
+          if last_comment &&
+            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
+            write_indent
+          end
         else
           if found_newline
             if newline_count == 1 && needs_two_lines_on_comment
@@ -2932,11 +2923,14 @@ class Rufo::Formatter
             track_comment
           end
         end
+        last_comment = current_token
+        last_comment_column = @column
         last_comment_has_newline = current_token_value.end_with?("\n")
-        write current_token_value.rstrip
-        next_token
         last = :comment
         multilple_lines = false
+
+        write current_token_value.rstrip
+        next_token
       when :on_embdoc_beg
         write_line if multilple_lines
 
@@ -3000,14 +2994,61 @@ class Rufo::Formatter
     end
   end
 
-  def indent_body(exps)
-    indent do
-      consume_end_of_line(want_multiline: false)
+  def indent_body(exps, force_multiline: false)
+    skip_space
+
+    has_semicolon = semicolon?
+
+    if has_semicolon
+      next_token
+      skip_semicolons
+    end
+
+    # If an end follows there's nothing to do
+    if keyword?("end")
+      if has_semicolon
+        write "; "
+      else
+        write " "
+      end
+      return
     end
 
     # A then keyword can appear after a newline after an `if`, `unless`, etc.
     # Since that's a super weird formatting for if, probably way too obsolete
     # by now, we just remove it.
+    has_then = keyword?("then")
+    if has_then
+      next_token
+      skip_space
+    end
+
+    has_do = keyword?("do")
+    if has_do
+      next_token
+      skip_space
+    end
+
+    # If no newline or comment follows, we format it inline.
+    if !force_multiline && !(newline? || comment?)
+      if has_then
+        write " then "
+      elsif has_do
+        write " do "
+      elsif has_semicolon
+        write "; "
+      else
+        write " "
+      end
+      visit_exps exps, with_indent: false, with_lines: false
+      consume_space
+      return
+    end
+
+    indent do
+      consume_end_of_line(want_multiline: false)
+    end
+
     if keyword?("then")
       next_token
       skip_space_or_newline
@@ -3273,27 +3314,27 @@ class Rufo::Formatter
   def do_align(elements, scope)
     lines = @output.lines
 
-    # Chunk comments that are in consecutive lines
+    # Chunk elements that are in consecutive lines
     chunks = chunk_while(elements) do |(l1, c1, i1, id1), (l2, c2, i2, id2)|
       l1 + 1 == l2 && i1 == i2 && id1 == id2
     end
 
-    chunks.each do |comments|
-      next if comments.size == 1
+    chunks.each do |elements|
+      next if elements.size == 1
 
       if scope == :hash_key
         # Don't indent successive hash keys if any of them is in turn a hash
         # or array literal that is formatted in separate lines.
-        has_brace_newline = comments.any? do |(l, c)|
+        has_brace_newline = elements.any? do |(l, c)|
           line_end = lines[l][c..-1]
           line_end.start_with?("=> {\n", "=> [\n", "=> [ #", "=> { #", "[\n", "{\n", "[ #", "{ #")
         end
         next if has_brace_newline
       end
 
-      max_column = comments.map { |l, c| c }.max
+      max_column = elements.map { |l, c| c }.max
 
-      comments.each do |(line, column, _, _, offset)|
+      elements.each do |(line, column, _, _, offset)|
         next if column == max_column
 
         split_index = column

data/lib/rufo/version.rb

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

metadata

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