rufo 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37581d331f99c0a339a02883d5eee479441a51c7
-  data.tar.gz: 5f65749a69f3d7542630b8509bb75b8925be48d1
+  metadata.gz: b322ac4c05931d04475299c6b98e3ca70537941c
+  data.tar.gz: 707eeb3653a5e309028fd3aea0f104654f9d7e4d
 SHA512:
-  metadata.gz: 987ae28a14a0c618bed6d037607d698931b71ce3b2757f59078ec68c58b0f239d66077931d9b53a65aa94c75309961fe5834f6dde425889a24165d55b47fb79f
-  data.tar.gz: 7070cc3d2d44f9fc55d1029458cf7145d36b7bf97c438ac2cda077f8c670521d5516d3b817e8cc32d483e3799766650327223c7431eca65a3d96a4dd8b3e9608
+  metadata.gz: 14cbee46609b75b46199a5dcd1b54f6066efc8b1fda1ec1e0f6494191f41fe6f0d8148c632c46bcb6868cd7a8ade5421d9d0a04dfbaaa125c51300b65d1a273c
+  data.tar.gz: 4b983949675d6764b73ecf1479ad26992aace76b197b1e96a348a8699416e83b2da645bf2392f066d5dca30a1d08e8c486ecb7a11c1ef5a9f2c98390f0373a59

data/.rufo

@@ -2,4 +2,5 @@ space_after_hash_brace :dynamic
 align_comments         true
 align_assignments      false
 align_hash_keys        true
+align_case_when        true
 indent_size            2

data/README.md

@@ -74,6 +74,9 @@ align_assignments false
 # Whether to align successive hash keys (default: true)
 align_hash_keys true
 
+# Whether to align successive case when (default: true)
+align_case_when true
+
 # The indent size (default: 2)
 indent_size 2
 ```

data/lib/rufo/formatter.rb

@@ -52,12 +52,16 @@ class Rufo::Formatter
     # Hash keys positions
     @hash_keys_positions = []
 
+    # Case when positions
+    @case_when_positions = []
+
     # Settings
     indent_size options.fetch(:indent_size, 2)
     space_after_hash_brace options.fetch(:space_after_hash_brace, :dynamic)
     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)
   end
 
   # The indent size (default: 2)
@@ -94,6 +98,11 @@ class Rufo::Formatter
     @align_hash_keys = value
   end
 
+  # Whether to align successive case when (default: true)
+  def align_case_when(value)
+    @align_case_when = value
+  end
+
   def format
     visit @sexp
     consume_end
@@ -101,6 +110,7 @@ class Rufo::Formatter
 
     do_align_assignments if @align_assignments
     do_align_hash_keys if @align_hash_keys
+    do_align_case_when if @align_case_when
     do_align_comments if @align_comments
   end
 
@@ -672,10 +682,14 @@ class Rufo::Formatter
     track_alignment @hash_keys_positions, 0, @current_hash.object_id
   end
 
+  def track_case_when
+    track_alignment @case_when_positions
+  end
+
   def track_alignment(target, offset = 0, id = nil)
     last = target.last
     if last && last[0] == @line
-      last << :ignore if last.size < 6
+      # Track only the first alignment in a line
       return
     end
 
@@ -1799,7 +1813,7 @@ class Rufo::Formatter
 
     if has_newline
       write_line
-      write_indent(next_indent)
+      write_indent
     end
 
     if last_token
@@ -2402,10 +2416,14 @@ class Rufo::Formatter
     if then_keyword
       next_token
       skip_space
+      track_case_when
       skip_semicolons
 
       if newline? || comment?
         inline = false
+
+        # Cancel tracking of `case when ... then` on a nelwine.
+        @case_when_positions.pop
       else
         write " then "
       end
@@ -2415,7 +2433,9 @@ class Rufo::Formatter
       if newline? || comment?
         inline = false
       else
-        write "; "
+        write ";"
+        track_case_when
+        write " "
       end
     end
 
@@ -2926,11 +2946,13 @@ class Rufo::Formatter
     do_align @hash_keys_positions, true, true
   end
 
+  def do_align_case_when
+    do_align @case_when_positions
+  end
+
   def do_align(elements, adjust_comments = true, hash_keys = false)
     lines = @output.lines
 
-    elements.reject! { |l, c, indent, id, off, ignore| ignore == :ignore }
-
     # Chunk comments 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

data/lib/rufo/version.rb

@@ -1,3 +1,3 @@
 module Rufo
-  VERSION = "0.0.19"
+  VERSION = "0.0.20"
 end

metadata

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