rfmt 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f1d0fa5ba56d10568e9dd3625974abc815350c4c6c2ff03d5114d8c38aae9a1
-  data.tar.gz: 4b6256a168e7be4a70c162a26bea0983fd6397397224cd1953abbe9cc1cbd01b
+  metadata.gz: 4fd5d79157230ea6ee461e070a3782267196b57692c37fc0e5e06a33f2dbd6fd
+  data.tar.gz: ea5b633304e771cd80a235ae79676581791f5f1f041de4d4013fd22e60b3cd5c
 SHA512:
-  metadata.gz: a90b0b5f699c21e3e5aebd5f33ce71c152694a3cc51c812d2ffda946d2250a7714ae572ab9e7538531386e09b91210aa50f5e4de49e1d11234afd6803525ede4
-  data.tar.gz: ab5588dfe3b5035e444219ad218756b475d964f18b47fdb78311593ba964c7c4436856abca58a13fc2e799eaa7d85815e6e70be39e6d0e083d9c7951c3867553
+  metadata.gz: 1d81952b2c5b9b9a3ba04617c60c1742d6141390be0da810bdc71ab2661bd767008bf7b744b1337496035bfeab39ee9db672163f23e9d693aad681edc8236256
+  data.tar.gz: '0950ad8b8a68dc96bb20fd980751805704b6f1a6be07268210fe309ba4b6642469899f61c62d8157770956732c272636d072d9ad29d148ff555335897df2ae0e'

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [1.6.3] - 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.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.

data/Cargo.lock

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

data/ext/rfmt/Cargo.toml

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

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

@@ -508,8 +508,42 @@ pub fn reformat_chain_lines(
         return Cow::Borrowed(source_text);
     }
 
-    // Build the indented chain with pre-allocated capacity
-    let chain_indent = " ".repeat(base_indent + indent_width);
+    // Determine how much the chain is moving left. Before this pass, every
+    // `.method` line sat at some original "chain indent" (most commonly
+    // aligned under the first receiver's dot). We rewrite those lines to
+    // `base_indent + indent_width` — but that also means any multi-line
+    // *arguments* that lived inside a chain call like `.select( … )` used
+    // to be deeper than the original chain indent, and will now look
+    // orphaned off to the right if we leave them alone:
+    //
+    //     @users = User.left_joins(...)
+    //                 .select(           <- was col 17, becomes col 6
+    //                   'users.*, ' \   <- still at col 19 — orphaned
+    //                 )
+    //                 .having(...)
+    //
+    // Compute the delta between the original chain indent and the new
+    // one, and shift every non-chain continuation line that lives at
+    // (or below) the original chain indent by the same amount. Lines
+    // shallower than the original chain indent (e.g. a heredoc body
+    // whose squiggly indent is measured from the terminator) are left
+    // alone, so we don't accidentally eat through them.
+    let new_chain_indent = base_indent + indent_width;
+    let chain_indent_str = " ".repeat(new_chain_indent);
+
+    let original_chain_indent = lines[1..].iter().find_map(|l| {
+        let t = l.trim_start();
+        if t.starts_with('.') || t.starts_with("&.") {
+            Some(l.len() - t.len())
+        } else {
+            None
+        }
+    });
+
+    let arg_shift = original_chain_indent
+        .map(|orig| orig.saturating_sub(new_chain_indent))
+        .unwrap_or(0);
+
     let mut result = String::with_capacity(source_text.len());
     result.push_str(lines[0].trim_end());
 
@@ -517,8 +551,18 @@ pub fn reformat_chain_lines(
         result.push('\n');
         let trimmed = line.trim();
         if trimmed.starts_with('.') || trimmed.starts_with("&.") {
-            result.push_str(&chain_indent);
+            result.push_str(&chain_indent_str);
             result.push_str(trimmed);
+        } else if arg_shift > 0 && !trimmed.is_empty() {
+            let indent = line.len() - line.trim_start().len();
+            let chain_base = original_chain_indent.unwrap_or(0);
+            if indent >= chain_base {
+                let new_indent = indent - arg_shift;
+                result.push_str(&" ".repeat(new_indent));
+                result.push_str(line.trim_start());
+            } else {
+                result.push_str(line);
+            }
         } else {
             // Non-chain continuation (e.g., heredoc content): preserve as-is
             result.push_str(line);

data/lib/rfmt/version.rb

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

metadata

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