rfmt 1.2.4 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c95517c6abaad1c4bf47425dd4853dcd78bf5a2e47ab2bdc0cae1a3d3698c54
-  data.tar.gz: a207798a5811f989a5ebb3405e48e0c86ac60d40b208f141e6d31a83de62dc0d
+  metadata.gz: b43c4cd99b99ae5b4525bc2efc9a3759e315cdbb200853345e2422d161fc58b6
+  data.tar.gz: e2f2f9fe52c401fadcd509e2705cbfca4a5bf0e84265f3ce7f764c1916e73470
 SHA512:
-  metadata.gz: 86307164b77b1836c57718c62ac84bbc920fbfc36a7f0367656bc4fadd65cd846df9f45e5d8985a3eff2f49a548a576a8a73cb05e8e78679fe666589e904762c
-  data.tar.gz: 69a7f17c2e547616ebea1a109628df5d3695fb9d9359715d90707a51c4d1c2d72095bad48ffc1d370e7229a01f193392235c3c7c2a0f13fd211dc0885ef2c447
+  metadata.gz: 9e728fee6c041313543cd631255e9ac6fdc3a69c7a22f32b2846be6cbed6a59e1d1ba2dd46d989850e9ac6bc8d4b31bd630a4477e6d0d767ef7dd73c4a5c76ed
+  data.tar.gz: 6a7d78ae563cc30ae96970562ddf027005631ae9a2d79755b49a44411fc0f90a2c81ba48a29150c326cc5e5ad793159890f46ae2ee4658a0baeeef7f5907a3d1

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 ## [Unreleased]
 
+## [1.2.6] - 2026-01-04
+
+### Changed
+- Version bump
+
+## [1.2.5] - 2026-01-04
+
+### Fixed
+- Fix trailing comments on `end` keyword (e.g., `end # rubocop:disable`)
+- Fix block internal comments being moved outside the block
+- Fix blank line preservation between code and comments inside blocks
+- Fix leading blank line being added to comment-only files
+
 ## [1.2.4] - 2026-01-04
 
 ### Fixed

data/Cargo.lock

@@ -1219,7 +1219,7 @@ checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001"
 
 [[package]]
 name = "rfmt"
-version = "1.2.4"
+version = "1.2.6"
 dependencies = [
  "anyhow",
  "clap",

data/ext/rfmt/Cargo.toml

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

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

@@ -79,24 +79,37 @@ impl Emitter {
     /// Emit all comments that haven't been emitted yet
     fn emit_remaining_comments(&mut self, last_code_line: usize) -> Result<()> {
         let mut last_end_line: Option<usize> = Some(last_code_line);
+        let mut is_first_comment = true;
+
         for (idx, comment) in self.all_comments.iter().enumerate() {
             if self.emitted_comment_indices.contains(&idx) {
                 continue;
             }
-            // Ensure we start on a new line for remaining comments
-            if !self.buffer.ends_with('\n') {
+
+            // For the first remaining comment:
+            // - If buffer is empty, don't add any leading newline
+            // - If buffer has content, ensure we start on a new line
+            if is_first_comment && self.buffer.is_empty() {
+                // Don't add leading newline for first comment when buffer is empty
+            } else if !self.buffer.ends_with('\n') {
                 self.buffer.push('\n');
             }
+
             // Preserve blank lines between code/comments
-            if let Some(prev_line) = last_end_line {
-                let gap = comment.location.start_line.saturating_sub(prev_line);
-                for _ in 1..gap {
-                    self.buffer.push('\n');
+            // But only if this is not the first comment in an empty buffer
+            if !(is_first_comment && self.buffer.is_empty()) {
+                if let Some(prev_line) = last_end_line {
+                    let gap = comment.location.start_line.saturating_sub(prev_line);
+                    for _ in 1..gap {
+                        self.buffer.push('\n');
+                    }
                 }
             }
+
             writeln!(self.buffer, "{}", comment.text)?;
             self.emitted_comment_indices.push(idx);
             last_end_line = Some(comment.location.end_line);
+            is_first_comment = false;
         }
         Ok(())
     }
@@ -221,6 +234,55 @@ impl Emitter {
         Ok(())
     }
 
+    /// Emit comments that are within a given line range, preserving blank lines from prev_line
+    fn emit_comments_in_range_with_prev_line(
+        &mut self,
+        start_line: usize,
+        end_line: usize,
+        indent_level: usize,
+        prev_line: usize,
+    ) -> Result<()> {
+        let indent_str = match self.config.formatting.indent_style {
+            IndentStyle::Spaces => " ".repeat(self.config.formatting.indent_width * indent_level),
+            IndentStyle::Tabs => "\t".repeat(indent_level),
+        };
+
+        let mut comments_to_emit = Vec::new();
+        for (idx, comment) in self.all_comments.iter().enumerate() {
+            if self.emitted_comment_indices.contains(&idx) {
+                continue;
+            }
+
+            if comment.location.start_line >= start_line && comment.location.end_line < end_line {
+                comments_to_emit.push((
+                    idx,
+                    comment.text.clone(),
+                    comment.location.start_line,
+                    comment.location.end_line,
+                ));
+            }
+        }
+
+        // Sort by start_line to emit in order
+        comments_to_emit.sort_by_key(|(_, _, start, _)| *start);
+
+        let mut last_end_line: usize = prev_line;
+
+        for (idx, text, comment_start_line, comment_end_line) in comments_to_emit {
+            // Preserve blank lines between previous content and this comment
+            let gap = comment_start_line.saturating_sub(last_end_line);
+            for _ in 1..gap {
+                self.buffer.push('\n');
+            }
+
+            writeln!(self.buffer, "{}{}", indent_str, text)?;
+            self.emitted_comment_indices.push(idx);
+            last_end_line = comment_end_line;
+        }
+
+        Ok(())
+    }
+
     /// Emit comments that appear on the same line (trailing comments)
     fn emit_trailing_comments(&mut self, line: usize) -> Result<()> {
         let mut indices_to_emit = Vec::new();
@@ -376,6 +438,8 @@ impl Emitter {
 
         self.emit_indent(indent_level)?;
         write!(self.buffer, "end")?;
+        // Emit trailing comments on end line (e.g., `end # rubocop:disable`)
+        self.emit_trailing_comments(node.location.end_line)?;
 
         Ok(())
     }
@@ -421,6 +485,8 @@ impl Emitter {
 
         self.emit_indent(indent_level)?;
         write!(self.buffer, "end")?;
+        // Emit trailing comments on end line (e.g., `end # rubocop:disable`)
+        self.emit_trailing_comments(node.location.end_line)?;
 
         Ok(())
     }
@@ -493,6 +559,8 @@ impl Emitter {
 
         self.emit_indent(indent_level)?;
         write!(self.buffer, "end")?;
+        // Emit trailing comments on end line (e.g., `end # rubocop:disable`)
+        self.emit_trailing_comments(node.location.end_line)?;
 
         Ok(())
     }
@@ -524,6 +592,8 @@ impl Emitter {
 
             self.emit_indent(indent_level)?;
             write!(self.buffer, "end")?;
+            // Emit trailing comments on end line
+            self.emit_trailing_comments(node.location.end_line)?;
         } else {
             // Implicit begin - emit children directly
             for (i, child) in node.children.iter().enumerate() {
@@ -714,6 +784,8 @@ impl Emitter {
         // Emit "end" keyword
         self.emit_indent(indent_level)?;
         write!(self.buffer, "end")?;
+        // Emit trailing comments on end line
+        self.emit_trailing_comments(node.location.end_line)?;
 
         Ok(())
     }
@@ -931,6 +1003,8 @@ impl Emitter {
         if !is_elsif {
             self.emit_indent(indent_level)?;
             write!(self.buffer, "end")?;
+            // Emit trailing comments on end line
+            self.emit_trailing_comments(node.location.end_line)?;
         }
 
         Ok(())
@@ -1021,17 +1095,46 @@ impl Emitter {
         self.buffer.push('\n');
 
         // Find and emit the body (StatementsNode among children)
+        let block_start_line = block_node.location.start_line;
+        let block_end_line = block_node.location.end_line;
+        let mut last_stmt_end_line = block_start_line;
+
         for child in &block_node.children {
             if matches!(child.node_type, NodeType::StatementsNode) {
                 self.emit_statements(child, indent_level + 1)?;
+                // Track the last statement's end line for blank line preservation
+                if let Some(last_child) = child.children.last() {
+                    last_stmt_end_line = last_child.location.end_line;
+                }
                 self.buffer.push('\n');
                 break;
             }
         }
 
+        // Emit comments that are inside the block but not attached to any node
+        // (comments between last statement and 'end')
+        let had_internal_comments =
+            self.has_comments_in_range(block_start_line + 1, block_end_line);
+        if had_internal_comments {
+            // Preserve blank line between last statement and first comment
+            self.emit_comments_in_range_with_prev_line(
+                block_start_line + 1,
+                block_end_line,
+                indent_level + 1,
+                last_stmt_end_line,
+            )?;
+        }
+
+        // Add newline if there were internal comments
+        if had_internal_comments && !self.buffer.ends_with('\n') {
+            self.buffer.push('\n');
+        }
+
         // Emit 'end'
         self.emit_indent(indent_level)?;
         write!(self.buffer, "end")?;
+        // Emit trailing comments on end line
+        self.emit_trailing_comments(block_end_line)?;
 
         Ok(())
     }
@@ -1220,6 +1323,8 @@ impl Emitter {
 
         self.emit_indent(indent_level)?;
         write!(self.buffer, "end")?;
+        // Emit trailing comments on end line
+        self.emit_trailing_comments(node.location.end_line)?;
 
         Ok(())
     }
@@ -1271,6 +1376,8 @@ impl Emitter {
 
         self.emit_indent(indent_level)?;
         write!(self.buffer, "end")?;
+        // Emit trailing comments on end line
+        self.emit_trailing_comments(node.location.end_line)?;
 
         Ok(())
     }

data/lib/rfmt/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rfmt
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.6
 platform: ruby
 authors:
 - fujitani sora
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-01-03 00:00:00.000000000 Z
+date: 2026-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys