rufo 0.17.1 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5df151931108df0740d8602c1bf8b931503e3bede6a337f25a9bf75cb549c70
-  data.tar.gz: 73a321c4a0960f8fc021b062149ccbe3f96ccfc231c780e2612de00e011f590b
+  metadata.gz: 2239283a440e83e68074430ba36c303f94701858ff8983394bf6eda08f588089
+  data.tar.gz: 141195447e27a7cc31b98f66b919142ffa46c49c5221617dcf9b3a6c3d25a306
 SHA512:
-  metadata.gz: 8a2176ae1780bce5ec076052b63576fc54370a4a5b2a7837166e8d42ec4f6f4f47cc1b4590f5742a6b7a263d7cb2b59fc7985a2dd9f1a37fa41939c502515253
-  data.tar.gz: aad26fad18830aad211ba7d16f65643b78648b4f755d0a43ac1b65edbba1d7f97e05535f7c2f499dc3a5a7fa2cfff295e2a5da1aa63af859090873598406ab60
+  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,16 @@ 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

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.

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.1"
+  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.1
+  version: 0.18.0
 platform: ruby
 authors:
 - Ary Borenszweig
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-03 00:00:00.000000000 Z
+date: 2024-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -203,7 +203,7 @@ 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:
   - - ">="