rfmt 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2df39db6eb525d4ca6bc42d55e01057e5a12772f0b61a7a8e3101e3a8fff76ec
-  data.tar.gz: b34bbf251457c8eb0d9174497c124f71d6a7b098ad506712acaec54812bcc674
+  metadata.gz: 75dbfbcc5bd176d4dc5394a718354c0d027c6ae2d855e2ee70422b3b17c91c8f
+  data.tar.gz: dafa925df2d12a4f055da3e03c777f96fb235eb5fde1b1d28c34ca8ba2ad110d
 SHA512:
-  metadata.gz: 1d341d108c8875f683a2ef3654e6e540b1fe9840a4f908abc75725da544c0b8be2b27cf5534cdf634eb2e9eaaa36bed0df9500f978a6fffc95ec7379e2485cf3
-  data.tar.gz: 9cbce53637c758998c79c77af60d10130dd293dac67c4a7918d882e816d848ef525400bd6fcebc030523a2407e08140dc1bc9227cbd9c1cfc3f579f0e5b477be
+  metadata.gz: 6444ec42f910b398e3129dbb9028577a9eb893de5224fcf35bd1ccc961142b6a9f33bda5f26c369ca6b8c569a5d26c166a81526c323f1cf7483d639e6e8dbc14
+  data.tar.gz: 4c013c8e0f7263c472c38cdbbdb12990f517e66fa5be011b9d7535ccb2cba473ba9ed958e0b5ff7fc789c693bc39c47bafa3cdfdb7bf06f6d55ba6d4b5b2e6a3

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 ## [Unreleased]
 
+## [1.5.1] - 2026-02-21
+
+### Fixed
+- Fix inline modifier `if`/`unless` formatting (#87)
+- Fix heredoc command incorrectly removed (#90, #86)
+- Fix method chain command dependency handling (#89, #85)
+
+### Added
+- Heredoc comment deletion support
+- Place block loop emission support
+
+### Changed
+- Update README.md
+- Code formatting improvements (RuboCop compliance)
+
 ## [1.5.0] - 2026-01-25
 
 ### Added

data/Cargo.lock

@@ -1214,7 +1214,7 @@ checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
 
 [[package]]
 name = "rfmt"
-version = "1.5.0"
+version = "1.5.1"
 dependencies = [
  "anyhow",
  "clap",

data/README.md

@@ -23,6 +23,7 @@ A Ruby code formatter written in Rust
 ## What is rfmt?
 
 [RubyGems reference](https://rubygems.org/gems/rfmt)
+[DeepWiki rfmt](https://deepwiki.com/fs0414/rfmt)
 
 **rfmt** is a Ruby code formatter that enforces consistent style across your codebase. Key characteristics:
 

data/ext/rfmt/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rfmt"
-version = "1.5.0"
+version = "1.5.1"
 edition = "2021"
 authors = ["fujitani sora <fujitanisora0414@gmail.com>"]
 license = "MIT"

data/ext/rfmt/src/emitter/mod.rs

@@ -1000,6 +1000,7 @@ impl Emitter {
                 self.write_source_text(predicate)?;
             }
 
+            self.emit_trailing_comments(node.location.end_line)?;
             return Ok(());
         }
 
@@ -1035,6 +1036,7 @@ impl Emitter {
                 }
             }
 
+            self.emit_trailing_comments(node.location.end_line)?;
             return Ok(());
         }
 
@@ -1196,6 +1198,16 @@ impl Emitter {
             if let Some(text) = self.source.get(start..end) {
                 // Trim trailing whitespace but preserve the content
                 write!(self.buffer, "{}", text.trim_end())?;
+
+                // Mark comments within the extracted range as emitted
+                for (idx, comment) in self.all_comments.iter().enumerate() {
+                    if !self.emitted_comment_indices.contains(&idx)
+                        && comment.location.start_offset >= start
+                        && comment.location.end_offset <= end
+                    {
+                        self.emitted_comment_indices.insert(idx);
+                    }
+                }
             }
         }
 

data/lib/rfmt/prism_bridge.rb

@@ -125,16 +125,14 @@ module Rfmt
         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
+      # Recursively check all descendant nodes for heredoc closing_loc
+      # Issue #74: handled direct children (e.g., LocalVariableWriteNode -> StringNode)
+      # Issue #86: handles deeper nesting (e.g., CallNode -> ArgumentsNode -> StringNode)
+      max_closing = find_max_closing_loc_recursive(node)
+      if max_closing && max_closing[:end_offset] > end_offset
+        end_offset = max_closing[:end_offset]
+        end_line = max_closing[:end_line]
+        end_column = max_closing[:end_column]
       end
 
       {
@@ -147,6 +145,32 @@ module Rfmt
       }
     end
 
+    # Recursively find the maximum closing_loc among all descendant nodes
+    # Returns nil if no closing_loc found, otherwise { end_offset:, end_line:, end_column: }
+    def self.find_max_closing_loc_recursive(node, depth: 0)
+      return nil if depth > 10
+
+      max_closing = nil
+
+      node.child_nodes.compact.each do |child|
+        if child.respond_to?(:closing_loc) && child.closing_loc
+          closing = child.closing_loc
+          if max_closing.nil? || closing.end_offset > max_closing[:end_offset]
+            max_closing = {
+              end_offset: closing.end_offset,
+              end_line: closing.end_line,
+              end_column: closing.end_column
+            }
+          end
+        end
+
+        child_max = find_max_closing_loc_recursive(child, depth: depth + 1)
+        max_closing = child_max if child_max && (max_closing.nil? || child_max[:end_offset] > max_closing[:end_offset])
+      end
+
+      max_closing
+    end
+
     # Extract child nodes
     def self.extract_children(node)
       children = []

data/lib/rfmt/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rfmt
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - fujitani sora