From 3af3f74c661f27b5f9670e610711fe7ae41c4a17 Mon Sep 17 00:00:00 2001
From: Zanie Blue <contact@zanie.dev>
Date: Mon, 30 Sep 2024 23:38:03 -0500
Subject: [PATCH] Update `dedent_to` to support blocks that are composed of
 comments (#13572)

While looking into https://github.com/astral-sh/ruff/issues/13545 I
noticed that we return `None` here if you pass a block of comments. This
is annoying because it causes `adjust_indentation` to fall back to
LibCST which panics when it cannot find a statement.
---
 crates/ruff_python_trivia/src/textwrap.rs | 34 +++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/crates/ruff_python_trivia/src/textwrap.rs b/crates/ruff_python_trivia/src/textwrap.rs
index f36bdef30d94b..ce5f46671a00f 100644
--- a/crates/ruff_python_trivia/src/textwrap.rs
+++ b/crates/ruff_python_trivia/src/textwrap.rs
@@ -130,6 +130,8 @@ pub fn dedent(text: &str) -> Cow<'_, str> {
 /// current indentation, then removes whitespace from each line to
 /// match the provided indentation.
 ///
+/// Leading comments are ignored unless the block is only composed of comments.
+///
 /// Lines that are indented by _less_ than the indent of the first line
 /// are left unchanged.
 ///
@@ -139,17 +141,21 @@ pub fn dedent(text: &str) -> Cow<'_, str> {
 /// If the first line is indented by less than the provided indent.
 pub fn dedent_to(text: &str, indent: &str) -> Option<String> {
     // Look at the indentation of the first non-empty line, to determine the "baseline" indentation.
+    let mut first_comment = None;
     let existing_indent_len = text
         .universal_newlines()
         .find_map(|line| {
             let trimmed = line.trim_whitespace_start();
-            if trimmed.is_empty() || trimmed.starts_with('#') {
+            if trimmed.is_empty() {
+                None
+            } else if trimmed.starts_with('#') && first_comment.is_none() {
+                first_comment = Some(line.len() - trimmed.len());
                 None
             } else {
                 Some(line.len() - trimmed.len())
             }
         })
-        .unwrap_or_default();
+        .unwrap_or(first_comment.unwrap_or_default());
 
     if existing_indent_len < indent.len() {
         return None;
@@ -431,5 +437,29 @@ mod tests {
             "baz"
         ].join("\n");
         assert_eq!(dedent_to(&x, ""), Some(y));
+
+        let x = [
+            "  # foo",
+            "    # bar",
+            "# baz"
+        ].join("\n");
+        let y = [
+            "  # foo",
+            "  # bar",
+            "# baz"
+        ].join("\n");
+        assert_eq!(dedent_to(&x, "  "), Some(y));
+
+        let x = [
+            "  # foo",
+            "    bar",
+            "      baz"
+        ].join("\n");
+        let y = [
+            "  # foo",
+            "  bar",
+            "    baz"
+        ].join("\n");
+        assert_eq!(dedent_to(&x, "  "), Some(y));
     }
 }