rufo 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ac44f22208635f26f7ba5e61ef3a2b8d1b545a1d9d5c9f467f7ca81103d769e
-  data.tar.gz: 020f099699c5f3274179abe580a05fc971becd4528f354388102ffed6ee45301
+  metadata.gz: 4651dcdf170f65e4e0da813add1f99623939ab8704b78c48572188a65de85252
+  data.tar.gz: 0d846bca50b9f15142e94894866280afb1a7963b9c729d0de84d3f469c7c0aad
 SHA512:
-  metadata.gz: c2332c7d55b1ac87ecaab7eaa01a27ef962cdd93bd3a6a697c1cc34afd5a104ca59b443d3a3d158cea72eccabad49e73b7a8e8e2f5954474258acebb73de3ced
-  data.tar.gz: 78ecfe030356e77f2ad2d3d7b04899714d2028d5cd63c8788cd3150ec9897c209b55896a3c90971ffd2c5c4a1de03b405dbec46a6fc5b8c9bb08c48bf08996b6
+  metadata.gz: af569cb8f398b61616546c2ba098e3fbe6ff576b0c7e0b467ef5bd181e6df90d4edae49f3e72a05b45de52c875e01cd9ed88ce2343af19a889efba571cdc4207
+  data.tar.gz: 75caf9bd7891406ee099eb8d707744ecf29f557a925b6c6b7d9108b7196ae52e793c7b53566af358f7676566e492c61b7a74af4ffbece87c6fb6c1b24b7f0e98

data/CHANGELOG.md

@@ -8,10 +8,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Fixed
 
+### Changed
+
 ### Added
 
+## [0.7.0] - 2019-04-28
+
+### Fixed
+- Argument align with splat (issue [123](https://github.com/ruby-formatter/rufo/issues/123))
+
 ### Changed
 
+### Added
+- Support jbuilder files (issue [173](https://github.com/ruby-formatter/rufo/issues/173))
+
 ## [0.6.1] - 2019-04-27
 
 ### Fixed

data/lib/rufo/file_finder.rb

@@ -20,6 +20,7 @@ class Rufo::FileFinder
     ".rb",
     ".gemspec",
     ".rake",
+    ".jbuilder",
   ]
 
   EXCLUDED_DIRS = [

data/lib/rufo/formatter.rb

@@ -1513,24 +1513,32 @@ class Rufo::Formatter
     # [:args_add_star, args, star, post_args]
     _, args, star, *post_args = node
 
+    if newline? || comment?
+      needs_indent = true
+      base_column = next_indent
+    else
+      base_column = @column
+    end
     if !args.empty? && args[0] == :args_add_star
       # arg1, ..., *star
       visit args
-    else
+    elsif !args.empty?
       visit_comma_separated_list args
+    else
+      consume_end_of_line if needs_indent
     end
 
     skip_space
 
     write_params_comma if comma?
-
+    write_indent(base_column) if needs_indent
     consume_op "*"
     skip_space_or_newline
     visit star
 
     if post_args && !post_args.empty?
       write_params_comma
-      visit_comma_separated_list post_args
+      visit_comma_separated_list post_args, needs_indent: needs_indent, base_column: base_column
     end
   end
 
@@ -1747,16 +1755,16 @@ class Rufo::Formatter
     end
   end
 
-  def visit_comma_separated_list(nodes)
-    needs_indent = false
-
+  def visit_comma_separated_list(nodes, needs_indent: false, base_column: nil)
     if newline? || comment?
       indent { consume_end_of_line }
       needs_indent = true
       base_column = next_indent
       write_indent(base_column)
+    elsif needs_indent
+      write_indent(base_column)
     else
-      base_column = @column
+      base_column ||= @column
     end
 
     nodes = to_ary(nodes)
@@ -1775,7 +1783,7 @@ class Rufo::Formatter
       check :on_comma
       write ","
       next_token
-      skip_space_or_newline_using_setting(:one, base_column || @indent)
+      skip_space_or_newline_using_setting(:one, base_column)
     end
   end
 

data/lib/rufo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rufo
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rufo
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Ary Borenszweig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-27 00:00:00.000000000 Z
+date: 2019-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler