rufo 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b047d001bf378b8733edc5693f53028394707a7
-  data.tar.gz: eeebbd17f2c9a4bd8a432629bc008bebfced7204
+  metadata.gz: 58d381d047814159725642414cb1a125ec50d64e
+  data.tar.gz: 7464184e3f7d22c002de35262849aef5e4d2c7a6
 SHA512:
-  metadata.gz: '082317f331df08fca9951fd18d64b458da6ce0fd118a1129da5f6b54e81b8618ce3e5894cda151c40246ed71dc3d12e19c3db3d06b4a9a12c1bbbffd06cf6b39'
-  data.tar.gz: 71e4d7f9c434c7693202a639d3644e93d5124070bd5ee4908efed5aa957aaef2018a8170d4ada5ba07a328a90654e8fbbd3f2504a757a8235a33bef336098840
+  metadata.gz: 796b5876a25028f262840d138d83fd7e506e29322e2c7c20b6f30dbd6cfa0050bbe6e329eaa66a821f651637704e4d337249f44ef23d9670b67f3657eeaa9c5f
+  data.tar.gz: 51bcf73cfd16618b9d512325a74acbddbd6936e61c1ec1069af28a613ebabe20209ec4f85bcebd2378b69fc75af7f37b0227d5cb919cbc9ce78f2a5e76e24688

data/lib/rufo/formatter.rb

@@ -41,6 +41,11 @@ class Rufo::Formatter
     # Position of comments that occur at the end of a line
     @comments_positions = []
 
+    # Associate a line to an index inside @comments_position
+    # becuase when aligning something to the left of a comment
+    # we need to adjust the relative comment
+    @line_to_comments_position_index = {}
+
     # Position of assignments
     @assignments_positions = []
 
@@ -86,9 +91,9 @@ class Rufo::Formatter
     consume_end
     write_line unless @last_was_newline
 
-    do_align_comments if @align_comments
     do_align_assignments if @align_assignments
     do_align_hash_keys if @align_hash_keys
+    do_align_comments if @align_comments
   end
 
   def visit(node)
@@ -488,7 +493,15 @@ class Rufo::Formatter
     _, string1, string2 = node
 
     visit string1
-    consume_space
+
+    if skip_space_backslash
+      write " \\"
+      write_line
+      write_indent
+    else
+      consume_space
+    end
+
     visit string2
   end
 
@@ -628,6 +641,7 @@ class Rufo::Formatter
   end
 
   def track_comment
+    @line_to_comments_position_index[@line] = @comments_positions.size
     @comments_positions << [@line, @column, 0, nil, 0]
   end
 
@@ -838,7 +852,13 @@ class Rufo::Formatter
 
     push_call(node) do
       visit name
-      consume_space
+      if skip_space_backslash
+        write " \\"
+        write_line
+        write_indent(next_indent)
+      else
+        consume_space
+      end
     end
 
     visit_command_end(node, args)
@@ -1340,8 +1360,16 @@ class Rufo::Formatter
     else
       needs_space = op != :* && op != :/ && op != :**
     end
-    skip_space
-    write_space " " if needs_space
+
+    if skip_space_backslash
+      needs_space = true
+      write " \\"
+      write_line
+      write_indent(next_indent)
+    else
+      write_space " " if needs_space
+    end
+
     consume_op_or_keyword op
     indent_after_space right, false, needs_space
   end
@@ -2353,6 +2381,15 @@ class Rufo::Formatter
     end
   end
 
+  def skip_space_backslash
+    has_slash_newline = false
+    while space?
+      has_slash_newline ||= current_token_value == "\\\n"
+      next_token
+    end
+    has_slash_newline
+  end
+
   def skip_space_or_newline(want_semicolon = false)
     found_newline = false
     found_comment = false
@@ -2763,7 +2800,7 @@ class Rufo::Formatter
   end
 
   def do_align_comments
-    do_align @comments_positions
+    do_align @comments_positions, false
   end
 
   def do_align_assignments
@@ -2774,7 +2811,7 @@ class Rufo::Formatter
     do_align @hash_keys_positions
   end
 
-  def do_align(elements)
+  def do_align(elements, adjust_comments = true)
     lines = @output.lines
 
     elements.reject! { |l, c, indent, id, off, ignore| ignore == :ignore }
@@ -2800,7 +2837,13 @@ class Rufo::Formatter
         before = target_line[0...split_index]
         after  = target_line[split_index..-1]
 
-        filler      = " " * (max_column - column)
+        filler_size = max_column - column
+        filler      = " " * filler_size
+
+        if adjust_comments && (index = @line_to_comments_position_index[line])
+          @comments_positions[index][1] += filler_size
+        end
+
         lines[line] = "#{before}#{filler}#{after}"
       end
     end

data/lib/rufo/version.rb

@@ -1,3 +1,3 @@
 module Rufo
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

metadata

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