rfmt 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 327f57f105df77a0d6b77bda9ab87c4f234f03f23fb918d74679942456c5a8ec
-  data.tar.gz: 482a5406275e422fb306970ffb47708f37be0c3115bc92485996d2adde6c9463
+  metadata.gz: 5f1d0fa5ba56d10568e9dd3625974abc815350c4c6c2ff03d5114d8c38aae9a1
+  data.tar.gz: 4b6256a168e7be4a70c162a26bea0983fd6397397224cd1953abbe9cc1cbd01b
 SHA512:
-  metadata.gz: 52982745650ed439f2ac7a5a1a9a26ae2dcf9e9df8015526278f58508929e15a1d72425d2d3c5963c0a4008968e20fcb6c374881122a3e99618d2cef15434eaf
-  data.tar.gz: 10e8282f05caacdffcbb2d7042e9f95a08c5d08c9b081307a12752840549fbb08b6bc557a256a9a46fd012986369fd7cfd0442a46d1d81146c2fb234d0b936f7
+  metadata.gz: a90b0b5f699c21e3e5aebd5f33ce71c152694a3cc51c812d2ffda946d2250a7714ae572ab9e7538531386e09b91210aa50f5e4de49e1d11234afd6803525ede4
+  data.tar.gz: ab5588dfe3b5035e444219ad218756b475d964f18b47fdb78311593ba964c7c4436856abca58a13fc2e799eaa7d85815e6e70be39e6d0e083d9c7951c3867553

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [1.6.2] - 2026-04-24
+
+Minor stability refinements on top of the 1.6.x architecture release. See the 1.6.1 notes below for the feature set this series delivers.
+
 ## [1.6.1] - 2026-04-24
 
 Follow-up release consolidating the 1.6.0 architecture work.

data/Cargo.lock

@@ -1251,7 +1251,7 @@ checksum = "a96887878f22d7bad8a3b6dc5b7440e0ada9a245242924394987b21cf2210a4c"
 
 [[package]]
 name = "rfmt"
-version = "1.6.1"
+version = "1.6.2"
 dependencies = [
  "anyhow",
  "clap",

data/ext/rfmt/Cargo.toml

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

data/ext/rfmt/src/format/rule.rs

@@ -217,6 +217,23 @@ pub fn format_comments_before_end(
     }
 
     let mut docs: Vec<Doc> = vec![hardline()];
+    // Preserve the blank line that separated the body's last content from
+    // the first trailing comment. Without this, a construct like
+    //
+    //   def foo
+    //     body
+    //                          <- blank line
+    //     # trailing annotation
+    //   end
+    //
+    // collapses to `body\n# trailing annotation\nend`. Detect the case
+    // heuristically: if the source line immediately above the first
+    // standalone comment is blank, emit an extra hardline.
+    if let Some(first) = standalone_refs.first() {
+        if first.start_line > 1 && is_line_blank(ctx.source(), first.start_line - 1) {
+            docs.push(hardline());
+        }
+    }
     let mut last_end_line: Option<usize> = None;
     let mut indices_to_mark: Vec<usize> = Vec::with_capacity(standalone_refs.len());
 
@@ -297,11 +314,23 @@ pub fn format_remaining_comments(ctx: &mut FormatContext, last_code_line: usize)
     let mut indices_to_mark: Vec<usize> = Vec::with_capacity(comment_refs.len());
 
     for cref in &comment_refs {
-        // Preserve blank lines
+        // Preserve blank lines. On the first iteration we must emit *at
+        // least one* hardline to separate the first remaining comment from
+        // the main document's last token (otherwise an orphan comment whose
+        // `start_line <= last_code_line` would concatenate onto whatever
+        // ended the output — producing e.g. `end# comment…` when a block's
+        // internal comments fall through to this tail handler). Round-tripping
+        // the already-formatted output must still be idempotent, so we
+        // cap the emission at the number of line breaks visible in the
+        // source: 1 for an adjacent comment, N for N-1 blank lines above it.
         let gap = cref.start_line.saturating_sub(last_end_line);
 
-        // Only add newlines if not the first comment or if there's a gap
-        if !is_first || gap > 0 {
+        if is_first {
+            let hardlines_to_emit = gap.max(1);
+            for _ in 0..hardlines_to_emit {
+                docs.push(hardline());
+            }
+        } else if gap > 0 {
             for _ in 0..gap.max(1) {
                 docs.push(hardline());
             }
@@ -499,6 +528,27 @@ pub fn reformat_chain_lines(
     Cow::Owned(result)
 }
 
+/// Returns true when the given 1-based `line` in `source` contains only
+/// whitespace (or is empty). Returns false for any line that has code or
+/// a comment.
+fn is_line_blank(source: &str, line: usize) -> bool {
+    let mut current = 1usize;
+    let mut line_start = 0usize;
+    for (i, b) in source.bytes().enumerate() {
+        if current == line {
+            let end = source[i..].find('\n').map_or(source.len(), |n| i + n);
+            return source[line_start..end]
+                .bytes()
+                .all(|b| b == b' ' || b == b'\t' || b == b'\r');
+        }
+        if b == b'\n' {
+            current += 1;
+            line_start = i + 1;
+        }
+    }
+    false
+}
+
 /// Removes at most one trailing `\n` (optionally preceded by a single `\r`)
 /// from `s`. Spaces, tabs, and any additional preceding newlines are
 /// preserved.

data/ext/rfmt/src/format/rules/call.rs

@@ -13,9 +13,9 @@ use crate::error::Result;
 use crate::format::context::FormatContext;
 use crate::format::registry::RuleRegistry;
 use crate::format::rule::{
-    format_child, format_leading_comments, format_statements, format_trailing_comment,
-    line_leading_indent, mark_comments_in_range_emitted, reformat_chain_lines,
-    strip_one_trailing_newline, FormatRule,
+    format_child, format_comments_before_end, format_leading_comments, format_statements,
+    format_trailing_comment, line_leading_indent, mark_comments_in_range_emitted,
+    reformat_chain_lines, strip_one_trailing_newline, FormatRule,
 };
 
 /// Rule for formatting method calls.
@@ -251,6 +251,23 @@ fn format_do_end_block(
         }
     }
 
+    // Emit any standalone comments between the last body statement and `end`.
+    //
+    // Without this the orphan comments inside a `do…end` block (e.g. the
+    // commented-out config stanzas in a generated `spec_helper.rb`) never
+    // get claimed by any `format_leading_comments` call, fall through to
+    // `format_remaining_comments` at the end of the file, and get emitted
+    // *after* the block's own `end` — producing `end# comment…` with no
+    // separator and dropping the body indent.
+    let comments_before_end = format_comments_before_end(
+        ctx,
+        block_node.location.start_line,
+        block_node.location.end_line,
+    );
+    if !comments_before_end.is_empty() {
+        docs.push(indent(comments_before_end));
+    }
+
     // Emit 'end'
     docs.push(hardline());
     docs.push(text("end"));

data/lib/rfmt/version.rb

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

metadata

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