From 4e9c504cbff017030b4df356f619c1ad2a50154c Mon Sep 17 00:00:00 2001
From: Waffle Lapkin <waffle.lapkin@gmail.com>
Date: Sat, 16 Aug 2025 14:26:34 +0200
Subject: [PATCH] implement tidy bless for alphabetical blocks

---
 Cargo.lock                         |  1 +
 src/tools/tidy/Cargo.toml          |  1 +
 src/tools/tidy/src/alphabetical.rs | 42 +++++++++++++++++++++---------
 3 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2cc2e094e9f9..46de7c331258 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5615,6 +5615,7 @@ dependencies = [
  "semver",
  "serde",
  "similar",
+ "tempfile",
  "termcolor",
  "toml 0.7.8",
  "walkdir",
diff --git a/src/tools/tidy/Cargo.toml b/src/tools/tidy/Cargo.toml
index c1f27de7ed4a..47b59543c59c 100644
--- a/src/tools/tidy/Cargo.toml
+++ b/src/tools/tidy/Cargo.toml
@@ -18,6 +18,7 @@ rustc-hash = "2.0.0"
 fluent-syntax = "0.12"
 similar = "2.5.0"
 toml = "0.7.8"
+tempfile = "3.15.0"
 
 [features]
 build-metrics = ["dep:serde"]
diff --git a/src/tools/tidy/src/alphabetical.rs b/src/tools/tidy/src/alphabetical.rs
index 6a1e777d9f2a..4ef1775d4bed 100644
--- a/src/tools/tidy/src/alphabetical.rs
+++ b/src/tools/tidy/src/alphabetical.rs
@@ -214,20 +214,36 @@ fn check_lines<'a>(path: &Path, content: &'a str, tidy_ctx: &TidyCtx, check: &mu
 
                 // oh nyooo :(
                 if sorted != section {
-                    let base_line_number = content[..offset + start_nl_end].lines().count();
-                    let line_offset = sorted
-                        .lines()
-                        .zip(section.lines())
-                        .enumerate()
-                        .find(|(_, (a, b))| a != b)
-                        .unwrap()
-                        .0;
-                    let line_number = base_line_number + line_offset;
+                    if !tidy_ctx.is_bless_enabled() {
+                        let base_line_number = content[..offset + start_nl_end].lines().count();
+                        let line_offset = sorted
+                            .lines()
+                            .zip(section.lines())
+                            .enumerate()
+                            .find(|(_, (a, b))| a != b)
+                            .unwrap()
+                            .0;
+                        let line_number = base_line_number + line_offset;
 
-                    check.error(format!(
-                        "{path}:{line_number}: line not in alphabetical order (tip: use --bless to sort this list)",
-                        path = path.display(),
-                    ));
+                        check.error(format!(
+                            "{path}:{line_number}: line not in alphabetical order (tip: use --bless to sort this list)",
+                            path = path.display(),
+                        ));
+                    } else {
+                        // Use atomic rename as to not corrupt the file upon crashes/ctrl+c
+                        let mut tempfile =
+                            tempfile::Builder::new().tempfile_in(path.parent().unwrap()).unwrap();
+
+                        fs::copy(path, tempfile.path()).unwrap();
+
+                        tempfile
+                            .as_file_mut()
+                            .seek(std::io::SeekFrom::Start((offset + start_nl_end) as u64))
+                            .unwrap();
+                        tempfile.as_file_mut().write_all(sorted.as_bytes()).unwrap();
+
+                        tempfile.persist(path).unwrap();
+                    }
                 }
 
                 // Start the next search after the end section