rfmt 1.5.0 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2df39db6eb525d4ca6bc42d55e01057e5a12772f0b61a7a8e3101e3a8fff76ec
-  data.tar.gz: b34bbf251457c8eb0d9174497c124f71d6a7b098ad506712acaec54812bcc674
+  metadata.gz: b17e8b19308af7368b77ac8b7a89bab1b7c321e16de03f1aae0b8d3df27f678c
+  data.tar.gz: 9929e63f33a0e116ce70441e86d6c525157517b37e2f83f4e9cb931d53eab8af
 SHA512:
-  metadata.gz: 1d341d108c8875f683a2ef3654e6e540b1fe9840a4f908abc75725da544c0b8be2b27cf5534cdf634eb2e9eaaa36bed0df9500f978a6fffc95ec7379e2485cf3
-  data.tar.gz: 9cbce53637c758998c79c77af60d10130dd293dac67c4a7918d882e816d848ef525400bd6fcebc030523a2407e08140dc1bc9227cbd9c1cfc3f579f0e5b477be
+  metadata.gz: f2c375826007f03f24163fa83b1b51dffa3ef241ad4e38c800145b8387b108368807cc221b4d453860861b2dea8fcfbea33ad7391b61c24f2d973da004078aaa
+  data.tar.gz: 7305b6778b6dcecb116a7e9df522d5085eee28f763fa88283ecc70a1a0d71e70eace61e7be736eb010a8cf8aacf556b34a9226d05cf83f9216c3e385d43ce720

data/CHANGELOG.md

@@ -1,5 +1,32 @@
 ## [Unreleased]
 
+## [1.5.2] - 2026-02-21
+
+### Added
+- Instance variable write node emission support (#92)
+
+### Changed
+- Nix dev environment optimization (build caching, direnv support, devShell splitting)
+- Code formatting improvements (clippy, rustfmt)
+
+### Fixed
+- Fix Nix bundler version conflict (remove pkgs.bundler, use Ruby built-in)
+
+## [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.2"
 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.2"
 edition = "2021"
 authors = ["fujitani sora <fujitanisora0414@gmail.com>"]
 license = "MIT"

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

@@ -463,6 +463,9 @@ impl Emitter {
             NodeType::SingletonClassNode => self.emit_singleton_class(node, indent_level)?,
             NodeType::CaseMatchNode => self.emit_case_match(node, indent_level)?,
             NodeType::InNode => self.emit_in(node, indent_level)?,
+            NodeType::LocalVariableWriteNode | NodeType::InstanceVariableWriteNode => {
+                self.emit_variable_write(node, indent_level)?
+            }
             _ => self.emit_generic(node, indent_level)?,
         }
         Ok(())
@@ -1000,6 +1003,7 @@ impl Emitter {
                 self.write_source_text(predicate)?;
             }
 
+            self.emit_trailing_comments(node.location.end_line)?;
             return Ok(());
         }
 
@@ -1035,6 +1039,7 @@ impl Emitter {
                 }
             }
 
+            self.emit_trailing_comments(node.location.end_line)?;
             return Ok(());
         }
 
@@ -1196,6 +1201,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);
+                    }
+                }
             }
         }
 
@@ -1368,6 +1383,48 @@ impl Emitter {
         Ok(())
     }
 
+    /// Emit variable write node (LocalVariableWriteNode, InstanceVariableWriteNode)
+    /// Handles `x = value` and `@x = value` patterns
+    fn emit_variable_write(&mut self, node: &Node, indent_level: usize) -> Result<()> {
+        self.emit_comments_before(node.location.start_line, indent_level)?;
+
+        let name = node.metadata.get("name").map(|s| s.as_str()).unwrap_or("_");
+
+        // Get value node (first child)
+        let value = match node.children.first() {
+            Some(v) => v,
+            None => {
+                // No value: fallback to source extraction
+                return self.emit_generic(node, indent_level);
+            }
+        };
+
+        let is_block_value = matches!(
+            value.node_type,
+            NodeType::IfNode
+                | NodeType::UnlessNode
+                | NodeType::CaseNode
+                | NodeType::CaseMatchNode
+                | NodeType::BeginNode
+                | NodeType::WhileNode
+                | NodeType::UntilNode
+                | NodeType::ForNode
+        );
+
+        self.emit_indent(indent_level)?;
+        if is_block_value {
+            writeln!(self.buffer, "{} =", name)?;
+            self.emit_node(value, indent_level + 1)?;
+        } else {
+            write!(self.buffer, "{} = ", name)?;
+            self.write_source_text_trimmed(value)?;
+        }
+
+        self.emit_trailing_comments(node.location.end_line)?;
+
+        Ok(())
+    }
+
     /// Emit generic node by extracting from source
     fn emit_generic(&mut self, node: &Node, indent_level: usize) -> Result<()> {
         self.emit_comments_before(node.location.start_line, indent_level)?;

data/ext/rfmt/src/parser/prism_adapter.rs

@@ -368,7 +368,7 @@ mod tests {
 
         let node = result.unwrap();
         assert_eq!(node.node_type, NodeType::ClassNode);
-        assert_eq!(node.formatting.multiline, true);
+        assert!(node.formatting.multiline);
         assert!(node.is_multiline());
         assert_eq!(node.line_count(), 3);
     }

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 = []
@@ -441,6 +465,8 @@ module Rfmt
         if (value = extract_literal_value(node))
           metadata['value'] = value
         end
+      when Prism::LocalVariableWriteNode, Prism::InstanceVariableWriteNode
+        metadata['name'] = node.name.to_s
       when Prism::IfNode, Prism::UnlessNode
         # Detect ternary operator: if_keyword_loc is nil for ternary
         metadata['is_ternary'] = node.if_keyword_loc.nil?.to_s if node.respond_to?(:if_keyword_loc)

data/lib/rfmt/version.rb

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

metadata

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