rufo 0.16.0 → 0.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52f19e023f290af007e285561a6806deec68912a07640c70221493f73f8f80a8
-  data.tar.gz: 118543384b66bdad4066b710b40f922c192833809a64e6a1075622fa3c1e80a8
+  metadata.gz: d9809eb345a055711f4ad309391cb96106eb90aff1cf09bcce15b537bad34e30
+  data.tar.gz: d77f6a70aeeb5fb6143f1dec1f29d8d645fa834f7a2fd467200c7d02b99a165b
 SHA512:
-  metadata.gz: f03e8e965486ce6f0920c3a9ef1fc9d3d3574c7fe75f64e04da03023be985d2677c4b0560044422f216857a1e9b87e0155c13d0f390dabb0f4354c7f941f32e1
-  data.tar.gz: 83ac8d4527b5c72260d56d827c681dded32a38e31763dc1c0b11b17d3549e19d476d0aa07345d13ea9c262a595a6010af39c69ac62fbd98d7f4507381f6ad5dd
+  metadata.gz: 5f43322e74c6cbdd90ca355caa0e4d17a9c625e4ea487a40807ecad7a75915531954ac287818c56a1e72566d1f25a6add653fe186d717406f9f3d4c11b8474bf
+  data.tar.gz: c9cd5e085bfe77882b5b1215e5de7d3939ba4de9bae634d750e74bac5000511fdcbc376f6f53e2cdd1ad4703dc1b6d344da96007a2147d579c52ee7113e21510

data/CHANGELOG.md

@@ -12,11 +12,30 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 
+## [0.16.2] - 2023-07-29
+
+### Fixed
+- Fix Bug: Unexpected EOF with blocks in .html.erb ([#297](https://github.com/ruby-formatter/rufo/issues/297))
+
+### Changed
+
+### Added
+
+## [0.16.1] - 2023-05-04
+
+### Fixed
+- Fix Bug: raises error while formatting pattern matching syntax ([#304](https://github.com/ruby-formatter/rufo/issues/304))
+- Fix Bug: avoid inserting a unnecessary comma to end of heredoc which in array with method call ([#303](https://github.com/ruby-formatter/rufo/pull/303))
+
+### Changed
+
+### Added
+
 ## [0.16.0] - 2023-04-02
 
 ### Fixed
 
-- Formats ERB files with configuration (issue [275](https://github.com/ruby-formatter/rufo/issues/275))
+- Formats ERB files with configuration ([#275](https://github.com/ruby-formatter/rufo/issues/275))
 
 ### Changed
 
@@ -58,8 +77,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 
-- Support for partial argument forwarding. (issue [268](https://github.com/ruby-formatter/rufo/issues/268))
-- Support for endless method. (issue [271](https://github.com/ruby-formatter/rufo/issues/271))
+- Support for partial argument forwarding. ([#268](https://github.com/ruby-formatter/rufo/issues/268))
+- Support for endless method. ([#271](https://github.com/ruby-formatter/rufo/issues/271))
 - Add Ruby 3.2.0 to test runs on CI.
 
 ## [0.13.0] - 2021-05-07
@@ -84,7 +103,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - File.read default encode UTF-8
 - Handle case where the code is invalid but ripper does not raise an error.
 - Removed implicit dependency on `rake`.
-- Error when semicolon and then used in a case statement #230.
+- Error when semicolon and then used in a case statement [#230](https://github.com/ruby-formatter/rufo/issues/230).
 
 ### Changed
 
@@ -175,22 +194,22 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [0.7.0] - 2019-04-28
 
 ### Fixed
-- Argument align with splat (issue [123](https://github.com/ruby-formatter/rufo/issues/123))
+- Argument align with splat ([#123](https://github.com/ruby-formatter/rufo/issues/123))
 
 ### Changed
 
 ### Added
-- Support jbuilder files (issue [173](https://github.com/ruby-formatter/rufo/issues/173))
+- Support jbuilder files ([#173](https://github.com/ruby-formatter/rufo/issues/173))
 
 ## [0.6.1] - 2019-04-27
 
 ### Fixed
-- Fix bug: symbol literal like `:"foo"` in ruby 2.6.3 (issue [168](https://github.com/ruby-formatter/rufo/issues/168))
+- Fix bug: symbol literal like `:"foo"` in ruby 2.6.3 ([#168](https://github.com/ruby-formatter/rufo/issues/168))
 
 ## [0.6.0] - 2019-03-04
 
 ### Fixed
-- Fix odd indentation of nested one liner "if" statements (issue [128](https://github.com/ruby-formatter/rufo/issues/128))
+- Fix odd indentation of nested one liner "if" statements ([#128](https://github.com/ruby-formatter/rufo/issues/128))
 
 ### Added
 - Ignore `vendor` directories from files to be checked. This allows rufo to be run without any arguments against a directory both locally and on common CI tools without needing any configuration.
@@ -204,7 +223,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Fixed
 
-- Fix bug: Rufo crashes on nested empty hash literal (issue [152](https://github.com/ruby-formatter/rufo/issues/152))
+- Fix bug: Rufo crashes on nested empty hash literal ([#152](https://github.com/ruby-formatter/rufo/issues/152))
 - Handle case where rufo would change formatting if run multiple times for hashes in some cases.
 
 ## [0.5.0] - 2019-02-09
@@ -222,7 +241,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [0.4.2] - 2019-01-22
 
 ### Fixed
-- Fix bug: Rufo indents squiggly HEREDOC incorrectly causing bad formating (issue [136](https://github.com/ruby-formatter/rufo/issues/136))
+- Fix bug: Rufo indents squiggly HEREDOC incorrectly causing bad formating ([#136](https://github.com/ruby-formatter/rufo/issues/136))
 
 ### Added
 
@@ -231,14 +250,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [0.4.1] - 2018-10-27
 
 ### Fixed
-- Fix bug for double colon operator in method definition (issue [#120](https://github.com/ruby-formatter/rufo/issues/120))
+- Fix bug for double colon operator in method definition ([#120](https://github.com/ruby-formatter/rufo/issues/120))
 
 ## [0.4.0] - 2018-08-09
 
 ### Fixed
-- Fix Bug: Rufo breaks HEREDOC syntax. (issue [#88](https://github.com/ruby-formatter/rufo/issues/88)). This fixes heredoc within parens formatting causing bad formatting and subsequent syntax error.
-- Fix Bug: formatter.rb:3700:in `block in adjust_other_alignments': undefined method `[]' for nil:NilClass (NoMethodError) (issue [#87](https://github.com/ruby-formatter/rufo/issues/87)). Check alignment target exists.
-- Fix Bug: Rufo keeps switching formatting on same file every time it runs (issue [#86](https://github.com/ruby-formatter/rufo/issues/86)). Avoids re-indenting nested literal indents.
+- Fix Bug: Rufo breaks HEREDOC syntax. ([#88](https://github.com/ruby-formatter/rufo/issues/88)). This fixes heredoc within parens formatting causing bad formatting and subsequent syntax error.
+- Fix Bug: formatter.rb:3700:in `block in adjust_other_alignments': undefined method `[]' for nil:NilClass (NoMethodError) ([#87](https://github.com/ruby-formatter/rufo/issues/87)). Check alignment target exists.
+- Fix Bug: Rufo keeps switching formatting on same file every time it runs ([#86](https://github.com/ruby-formatter/rufo/issues/86)). Avoids re-indenting nested literal indents.
 
 ### Added
 - Allow for simpler else_body node to suit new Ripper style in 2.6.0
@@ -250,7 +269,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [0.3.1] - 2018-04-12
 
 ### Fixed
-- Fix `quote_style` config not being respected (issue [#95](https://github.com/ruby-formatter/rufo/issues/95)).
+- Fix `quote_style` config not being respected ([#95](https://github.com/ruby-formatter/rufo/issues/95)).
 
 ## [0.3.0] - 2018-03-24
 
@@ -259,9 +278,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Normalize string quotes according to quote_style, which defaults to :double.
 
 ### Fixed
-- Fix printing of extraneous trailing semicolons from inline classes, modules, methods (issue [#59](https://github.com/ruby-formatter/rufo/issues/59))
-- Fix unhandled white space between array getter/setters `x[0] [0]` (issue [#62](https://github.com/ruby-formatter/rufo/issues/62))
-- Fix comma printing for heredocs when inside a hash (issue [#61](https://github.com/ruby-formatter/rufo/issues/61))
+- Fix printing of extraneous trailing semicolons from inline classes, modules, methods ([#59](https://github.com/ruby-formatter/rufo/issues/59))
+- Fix unhandled white space between array getter/setters `x[0] [0]` ([#62](https://github.com/ruby-formatter/rufo/issues/62))
+- Fix comma printing for heredocs when inside a hash ([#61](https://github.com/ruby-formatter/rufo/issues/61))
 - Fix array literals against changes to Ruby 2.5.0
 
 ## [0.2.0] - 2017-11-13
@@ -302,8 +321,8 @@ The following configuration options have been **removed**, and replaced with non
 
 ### Fixed
 - Fix crash in Ruby <= 2.3.4, <= 2.4.1 in the presence of certain squiggly doc (`<<~`) with multiple embedded expressions. The real fix here is to upgrade Ruby to >= 2.3.5 / >= 2.4.2
-- Fix dedent bug and bad formatting caused by comments within chained calls (issue [#49](https://github.com/ruby-formatter/rufo/issues/49))
-- Fix formatting bug for `for i, in [[1, 2]] ; x ; end` (issue [#45](https://github.com/ruby-formatter/rufo/issues/45))
+- Fix dedent bug and bad formatting caused by comments within chained calls ([#49](https://github.com/ruby-formatter/rufo/issues/49))
+- Fix formatting bug for `for i, in [[1, 2]] ; x ; end` ([#45](https://github.com/ruby-formatter/rufo/issues/45))
 
 ## [0.1.0] - 2017-10-08
 Beginning of logging changes!

data/lib/rufo/erb_formatter.rb

@@ -125,9 +125,16 @@ class Rufo::ErbFormatter
     string
   end
 
+  CODE_BLOCK_KEYWORDS = %w[BEGIN END begin case class def do else elsif end ensure for if module rescue unless until while]
+
+  def code_block_token?(token)
+    _, kind, value = token
+    kind == :on_kw && CODE_BLOCK_KEYWORDS.include?(value)
+  end
+
   def determine_code_wrappers(code_str)
-    keywords = Ripper.lex("#{code_str}").filter { |lex_token| lex_token[1] == :on_kw }
-    lexical_tokens = keywords.filter { |lex_token| lex_token[2] != "when" }.map { |lex_token| lex_token[3].to_s }
+    keywords = Ripper.lex("#{code_str}").filter { |lex_token| code_block_token?(lex_token) }
+    lexical_tokens = keywords.map { |lex_token| lex_token[3].to_s }
     state_tally = lexical_tokens.group_by(&:itself).transform_values(&:count)
     beg_token = state_tally["BEG"] || state_tally["EXPR_BEG"] || 0
     end_token = state_tally["END"] || state_tally["EXPR_END"] || 0

data/lib/rufo/formatter.rb

@@ -600,8 +600,8 @@ class Rufo::Formatter
       needs_comma = !comma? && trailing_commas
 
       if inside_literal_elements_list && needs_comma
-        write ","
         @last_was_heredoc = true
+        @end_of_heredoc_position = @output.length
       end
 
       @output << captured_output
@@ -2847,7 +2847,13 @@ class Rufo::Formatter
     @literal_elements_level = nil
 
     if needs_trailing_comma
-      write "," unless wrote_comma || !trailing_commas || @last_was_heredoc
+      if !wrote_comma && trailing_commas
+        if @last_was_heredoc
+          @output.insert(@end_of_heredoc_position, ",")
+        else
+          write ","
+        end
+      end
 
       consume_end_of_line(first_space: first_space)
       write_indent
@@ -3014,7 +3020,18 @@ class Rufo::Formatter
       when :when
         visit_comma_separated_list conds_or_pattern
       when :in
+        parens = current_token_kind == :on_lparen
+        if parens
+          consume_token :on_lparen
+          skip_space_or_newline
+        end
+
         visit conds_or_pattern
+
+        if parens
+          skip_space_or_newline
+          consume_token :on_rparen
+        end
       end
       skip_space
     end

data/lib/rufo/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rufo
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.2
 platform: ruby
 authors:
 - Ary Borenszweig
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-02 00:00:00.000000000 Z
+date: 2023-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -171,7 +171,6 @@ files:
 - README.md
 - Rakefile
 - bin/console
-- bin/runtest
 - bin/setup
 - bin/verify-sample-code
 - docs/developing-rufo.md
@@ -211,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.5.0.dev
 signing_key:
 specification_version: 4
 summary: Ruby code formatter

data/bin/runtest

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-for ver in "2.7.6" "3.0.4" "3.1.3" "3.2.0"; do
-  rbenv local "$ver"
-  (bundle check || bundle) && rake
-  if [ $? != 0 ]; then
-    echo "failed on $ver"
-    exit 1
-  fi
-done