rfmt 1.4.1-x86_64-linux → 1.5.0-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26c58dcd3bb39dd502cf8e9b6e78d19f3174b7f6c5e47a66bb6895847269404f
-  data.tar.gz: 6306da0c7f60fe221b880463140a61db6b546ecd391d83ddbf0a21dd06c0d54b
+  metadata.gz: 4053802615829cdc5486152d505d85c507525e2fa1a9988114439239434bcdba
+  data.tar.gz: 1e3cffc87f7e060e578cfb1691e1bf3b1a0e36a7f11ce5f3e1163c16c43962d0
 SHA512:
-  metadata.gz: bc69c44d7d91c779b2b8a0bccddbbd2a0c9130ea750e35ff50a99df024cfe7065538fde2d790d4b74545c9e99cdaa7f8a7f10a70fb5b66d23106a29fc7f4140e
-  data.tar.gz: 05172e13612bfb09f58c4acbd7b59255511ea0653dbdeee075ecd36babb6795ac3a09e341863c2e5eca7df9316250dd4486061dfc7b9d74a3c8c99d88adb7d1b
+  metadata.gz: 90bfc6e61e4e92ef0e409fae6f96813830b8e54c295fb1c8e651fa9c558fbe6cacf032c37429020ac342ea7f37c75edd2fd7f8112bb7d95e5742e0c3e435045f
+  data.tar.gz: cca2ccfeba96a13a0101055b4b7e878695f6b7e615e5c7b091e9c96a33a984776cfae83e02f994efa1837dda272285308468cbfe0b96446bda6dbbf68a1482f4

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 ## [Unreleased]
 
+## [1.5.0] - 2026-01-25
+
+### Added
+- Docker Compose test environment setup (#84)
+- Support for `then` expression emission (#80)
+- CI support for Ruby 3.4 and Ruby 4 (#82)
+
+### Changed
+- Upgrade Magnus (Rust-Ruby FFI library) (#83)
+- Optimize Docker build with multi-stage and caching (#84)
+- Upgrade unicode-emoji dependency
+
+### Fixed
+- Preserve heredoc content and closing identifier (#81)
+- Fix `rescue`/`ensure` clauses being deleted inside `do...end` blocks (#78)
+- Fix inline comment node handling (#77)
+- Fix BTreeMap range error (Issue #71)
+
 ## [1.4.1] - 2026-01-17
 
 ### Fixed

data/lib/rfmt/prism_bridge.rb

@@ -108,13 +108,42 @@ module Rfmt
     # Extract location information from node
     def self.extract_location(node)
       loc = node.location
+
+      # For heredoc nodes, the location only covers the opening tag (<<~CSV)
+      # We need to find the maximum end_offset including closing_loc
+      end_offset = loc.end_offset
+      end_line = loc.end_line
+      end_column = loc.end_column
+
+      # Check this node's closing_loc
+      if node.respond_to?(:closing_loc) && node.closing_loc
+        closing = node.closing_loc
+        if closing.end_offset > end_offset
+          end_offset = closing.end_offset
+          end_line = closing.end_line
+          end_column = closing.end_column
+        end
+      end
+
+      # Check child nodes for heredoc (e.g., LocalVariableWriteNode containing StringNode)
+      node.child_nodes.compact.each do |child|
+        next unless child.respond_to?(:closing_loc) && child.closing_loc
+
+        closing = child.closing_loc
+        next unless closing.end_offset > end_offset
+
+        end_offset = closing.end_offset
+        end_line = closing.end_line
+        end_column = closing.end_column
+      end
+
       {
         start_line: loc.start_line,
         start_column: loc.start_column,
-        end_line: loc.end_line,
-        end_column: loc.end_column,
+        end_line: end_line,
+        end_column: end_column,
         start_offset: loc.start_offset,
-        end_offset: loc.end_offset
+        end_offset: end_offset
       }
     end
 
@@ -176,6 +205,7 @@ module Rfmt
                      [
                        node.statements,
                        node.rescue_clause,
+                       node.else_clause,
                        node.ensure_clause
                      ].compact
                    when Prism::EnsureNode

data/lib/rfmt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rfmt
-  VERSION = '1.4.1'
+  VERSION = '1.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rfmt
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: x86_64-linux
 authors:
 - fujitani sora
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2026-01-17 00:00:00.000000000 Z
+date: 2026-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -65,9 +65,8 @@ files:
 - README.md
 - exe/rfmt
 - lib/rfmt.rb
-- lib/rfmt/3.1/rfmt.so
-- lib/rfmt/3.2/rfmt.so
 - lib/rfmt/3.3/rfmt.so
+- lib/rfmt/3.4/rfmt.so
 - lib/rfmt/cache.rb
 - lib/rfmt/cli.rb
 - lib/rfmt/configuration.rb
@@ -94,10 +93,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.3'
   - - "<"
     - !ruby/object:Gem::Version
-      version: 3.4.dev
+      version: 3.5.dev
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="