rufo 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2415782555ad95778ec90751f3c438320fb1797c44213c458c0d0a7f956cf2fc
-  data.tar.gz: 6e2bed742d8efedef98b59b74acaef679764eeb5911e6fc0b596da1a9cec7807
+  metadata.gz: 2239283a440e83e68074430ba36c303f94701858ff8983394bf6eda08f588089
+  data.tar.gz: 141195447e27a7cc31b98f66b919142ffa46c49c5221617dcf9b3a6c3d25a306
 SHA512:
-  metadata.gz: f103da0397ad0415a031601e14016d0080c9c22cac9d4b3af45a01f7f32a6fd851118d871d09272a8c41c7373ab8e77caac81b815899634eac66941e1f67121c
-  data.tar.gz: dcc1b6e6430818500a3238c1d403dd23abdfc840757318e1746bd388e0d1f4ce9a0df12a232bad5f6691dc69cd9cf6421ea1c74df8ed58c29453ac5260c91c4b
+  metadata.gz: 9f71537f4b5741d60dc0b23ed49cff278708ce2d58901b07765be00c34ec87e6a9cba70963fe3e60beaa2bcf9281b03e15535f3b7df76b1cb81235dc18e3616b
+  data.tar.gz: '091c1fe438ad222e6958b5016543882a21e943cde22b56f7a10cc67baf356ae43d3d54646a7576530711e224ae915227c647c6d95c6d51709814432416036d00'

data/.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby_version: ['3.3', '3.2', '3.1', '3.0', '2.7']
+        ruby_version: ['3.3', '3.2', '3.1', '3.0']
 
     steps:
     - uses: actions/checkout@v3

data/.rubocop.yml

@@ -3,7 +3,7 @@ AllCops:
   Exclude:
     - "spec/**/*"
     - "vendor/**/*"
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.0
 
 Layout:
   Enabled: false

data/CHANGELOG.md

@@ -12,6 +12,27 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 
+## [0.18.0] - 2024-05-30
+
+### Fixed
+- Fix error when formatting ERB ([#319](https://github.com/ruby-formatter/rufo/issues/319))
+
+### Changed
+- Dropped support for Ruby 2.7 as it is end of life.
+
+### Added
+
+## [0.17.1] - 2024-02-03
+
+### Fixed
+- Fix incorrect indentation methods call with splat ([#320](https://github.com/ruby-formatter/rufo/pull/320))
+
+### Changed
+- Remove unused internal methods from `Rufo::Formatter` ([#321](https://github.com/ruby-formatter/rufo/pull/321))
+  - This change may affect behavior with versions of Ruby not currently supported by Rufo (< 2.7)
+
+### Added
+
 ## [0.17.0] - 2024-01-06
 
 ### Fixed

data/bin/verify-sample-code

@@ -1,9 +1,8 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 repos = {
-  "lostisland/faraday" => {
-    "--format" => "progress",
-  },
+  "rspec/rspec-expectations" => {},
+  "rspec/rspec-mocks" => {},
 }
 
 def run_command(cmd, allowed_statuses: [0])

data/lib/rufo/formatter.rb

@@ -18,6 +18,7 @@ class Rufo::Formatter
 
     @tokens = Rufo::Parser.lex(code).reverse!
     @sexp = Rufo::Parser.sexp(code)
+    @sexp ||= Rufo::Parser.sexp_unparsable_code(code)
 
     # sexp being nil means that the code is not valid.
     # Parse the code so we get better error messages.
@@ -396,8 +397,6 @@ class Rufo::Formatter
       visit_module(node)
     when :mrhs_new_from_args
       visit_mrhs_new_from_args(node)
-    when :mlhs_paren
-      visit_mlhs_paren(node)
     when :mlhs
       visit_mlhs(node)
     when :mrhs_add_star
@@ -457,8 +456,6 @@ class Rufo::Formatter
       visit_alias(node)
     when :undef
       visit_undef(node)
-    when :mlhs_add_star
-      visit_mlhs_add_star(node)
     when :rest_param
       visit_rest_param(node)
     when :kwrest_param
@@ -906,26 +903,6 @@ class Rufo::Formatter
     end
   end
 
-  def indentable_value?(value)
-    return unless current_token_kind == :on_kw
-
-    case current_token_value
-    when "if", "unless", "case"
-      true
-    when "begin"
-      # Only indent if it's begin/rescue
-      return false unless value[0] == :begin
-
-      body = value[1]
-      return false unless body[0] == :bodystmt
-
-      _, _, rescue_body, else_body, ensure_body = body
-      rescue_body || else_body || ensure_body
-    else
-      false
-    end
-  end
-
   def current_comment_aligned_to_previous_one?
     @last_comment &&
       @last_comment[0][0] + 1 == current_token_line &&
@@ -1541,7 +1518,8 @@ class Rufo::Formatter
 
     skip_space
 
-    write_params_comma if comma?
+    # Disable indentation in write_params_comma to avoid double indentation with write_indent
+    write_params_comma(with_indent: !needs_indent) if comma?
     write_indent(base_column) if needs_indent
     consume_op "*"
     skip_space_or_newline
@@ -1551,7 +1529,8 @@ class Rufo::Formatter
     end
 
     if post_args && !post_args.empty?
-      write_params_comma
+      # Disable indentation in write_params_comma to avoid double indentation with visit_comma_separated_list
+      write_params_comma(with_indent: !needs_indent)
       visit_comma_separated_list post_args, needs_indent: needs_indent, base_column: base_column
     end
   end
@@ -1659,23 +1638,10 @@ class Rufo::Formatter
     end
   end
 
-  def visit_mlhs_paren(node)
-    # [:mlhs_paren,
-    #   [[:mlhs_paren, [:@ident, "x", [1, 12]]]]
-    # ]
-    _, args = node
-
-    visit_mlhs_or_mlhs_paren(args)
-  end
-
   def visit_mlhs(node)
     # [:mlsh, *args]
     _, *args = node
 
-    visit_mlhs_or_mlhs_paren(args)
-  end
-
-  def visit_mlhs_or_mlhs_paren(args)
     # Sometimes a paren comes, some times not, so act accordingly.
     has_paren = current_token_kind == :on_lparen
     if has_paren
@@ -1819,35 +1785,6 @@ class Rufo::Formatter
     end
   end
 
-  def visit_mlhs_add_star(node)
-    # [:mlhs_add_star, before, star, after]
-    _, before, star, after = node
-
-    if before && !before.empty?
-      # Maybe a Ripper bug, but if there's something before a star
-      # then a star shouldn't be here... but if it is... handle it
-      # somehow...
-      if op?("*")
-        star = before
-      else
-        visit_comma_separated_list to_ary(before)
-        write_params_comma
-      end
-    end
-
-    consume_op "*"
-
-    if star
-      skip_space_or_newline
-      visit star
-    end
-
-    if after && !after.empty?
-      write_params_comma
-      visit_comma_separated_list after
-    end
-  end
-
   def visit_rest_param(node)
     # [:rest_param, name]
 
@@ -2250,12 +2187,14 @@ class Rufo::Formatter
     end
   end
 
-  def write_params_comma
+  def write_params_comma(with_indent: true)
     skip_space
     check :on_comma
     write ","
     next_token
-    skip_space_or_newline_using_setting(:one)
+
+    indent_size = with_indent ? @indent : 0
+    skip_space_or_newline_using_setting(:one, indent_size)
   end
 
   def visit_array(node)

data/lib/rufo/parser.rb

@@ -10,4 +10,48 @@ class Rufo::Parser < Ripper
   def on_parse_error(msg)
     raise ::Rufo::SyntaxError.new(msg, lineno)
   end
+
+  def self.sexp_unparsable_code(code)
+    code_type = detect_unparsable_code_type(code)
+
+    case code_type
+    when :yield
+      extract_original_code_sexp(
+        "def __rufo_dummy; #{code}; end",
+        ->(exp) { exp => [:def, *, [:bodystmt, exps, *]]; exps }
+      )
+    when :next, :break, :redo
+      extract_original_code_sexp(
+        "loop do; #{code}; end",
+        ->(exp) { exp => [:method_add_block, *, [:do_block, nil, [:bodystmt, [[:void_stmt], *exps], *]]]; exps }
+      )
+    when :retry
+      extract_original_code_sexp(
+        "begin; rescue; #{code}; end",
+        ->(exp) { exp => [:begin, [:bodystmt, Array, [:rescue, nil, nil, exps, *], *]]; exps }
+      )
+    end
+  end
+
+  def self.detect_unparsable_code_type(code)
+    tokens = self.lex(code)
+    token = tokens.find { |_, kind| kind != :on_sp && kind != :on_ignored_nl }
+
+    case token
+    in [_, :on_kw, "yield" | "next" | "break" | "retry" | "redo" => kw, _]
+      kw.to_sym
+    else
+      nil
+    end
+  end
+
+  def self.extract_original_code_sexp(decorated_code, extractor)
+    sexp = self.sexp(decorated_code)
+    return nil unless sexp
+
+    # [:program, [exp]]
+    exp = sexp[1][0]
+    code_exps = extractor.call(exp)
+    [:program, code_exps]
+  end
 end

data/lib/rufo/version.rb

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

data/rufo.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.bindir = "exe"
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = ">= 2.7.0"
+  spec.required_ruby_version = ">= 3.0.0"
   spec.metadata["rubygems_mfa_required"] = "true"
 
   spec.add_development_dependency "bundler", ">= 1.15"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rufo
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Ary Borenszweig
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-06 00:00:00.000000000 Z
+date: 2024-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -203,14 +203,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Ruby code formatter