remove dedent_to usage from adjust_indentation`

diceroll123 · diceroll123 · commit 3e2f778c7057 · 2024-08-08T02:33:15.000-04:00
diff --git a/crates/ruff_linter/src/fix/edits.rs b/crates/ruff_linter/src/fix/edits.rs
@@ -8,7 +8,6 @@ use ruff_python_ast::{self as ast, Arguments, ExceptHandler, Expr, ExprList, Stm
 use ruff_python_ast::{AnyNodeRef, ArgOrKeyword};
 use ruff_python_codegen::Stylist;
 use ruff_python_index::Indexer;
-use ruff_python_trivia::textwrap::dedent_to;
 use ruff_python_trivia::{
     has_leading_content, is_python_whitespace, CommentRanges, PythonWhitespace, SimpleTokenKind,
     SimpleTokenizer,
@@ -297,34 +296,27 @@ pub(crate) fn adjust_indentation(
     range: TextRange,
     indentation: &str,
     locator: &Locator,
-    indexer: &Indexer,
     stylist: &Stylist,
 ) -> Result<String> {
     // If the range includes a multi-line string, use LibCST to ensure that we don't adjust the
     // whitespace _within_ the string.
-    if indexer.multiline_ranges().intersects(range) || indexer.fstring_ranges().intersects(range) {
-        let contents = locator.slice(range);
+    let contents = locator.slice(range);
 
-        let module_text = format!("def f():{}{contents}", stylist.line_ending().as_str());
+    let module_text = format!("def f():{}{contents}", stylist.line_ending().as_str());
 
-        let mut tree = match_statement(&module_text)?;
+    let mut tree = match_statement(&module_text)?;
 
-        let embedding = match_function_def(&mut tree)?;
+    let embedding = match_function_def(&mut tree)?;
 
-        let indented_block = match_indented_block(&mut embedding.body)?;
-        indented_block.indent = Some(indentation);
+    let indented_block = match_indented_block(&mut embedding.body)?;
+    indented_block.indent = Some(indentation);
 
-        let module_text = indented_block.codegen_stylist(stylist);
-        let module_text = module_text
-            .strip_prefix(stylist.line_ending().as_str())
-            .unwrap()
-            .to_string();
-        Ok(module_text)
-    } else {
-        // Otherwise, we can do a simple adjustment ourselves.
-        let contents = locator.slice(range);
-        Ok(dedent_to(contents, indentation))
-    }
+    let module_text = indented_block.codegen_stylist(stylist);
+    let module_text = module_text
+        .strip_prefix(stylist.line_ending().as_str())
+        .unwrap()
+        .to_string();
+    Ok(module_text)
 }
 
 /// Determine if a vector contains only one, specific element.
diff --git a/crates/ruff_linter/src/rules/flake8_return/rules/function.rs b/crates/ruff_linter/src/rules/flake8_return/rules/function.rs
@@ -877,7 +877,6 @@ fn remove_else(
             TextRange::new(else_colon_end, elif_else.end()),
             desired_indentation,
             locator,
-            indexer,
             stylist,
         )?;
 
diff --git a/crates/ruff_linter/src/rules/pylint/rules/collapsible_else_if.rs b/crates/ruff_linter/src/rules/pylint/rules/collapsible_else_if.rs
@@ -5,7 +5,6 @@ use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::{self as ast, ElifElseClause, Stmt};
 use ruff_python_codegen::Stylist;
-use ruff_python_index::Indexer;
 use ruff_source_file::Locator;
 use ruff_text_size::{Ranged, TextRange};
 
@@ -85,15 +84,8 @@ pub(crate) fn collapsible_else_if(checker: &mut Checker, stmt: &Stmt) {
         CollapsibleElseIf,
         TextRange::new(else_clause.start(), first.start()),
     );
-    diagnostic.try_set_fix(|| {
-        convert_to_elif(
-            first,
-            else_clause,
-            checker.locator(),
-            checker.indexer(),
-            checker.stylist(),
-        )
-    });
+    diagnostic
+        .try_set_fix(|| convert_to_elif(first, else_clause, checker.locator(), checker.stylist()));
     checker.diagnostics.push(diagnostic);
 }
 
@@ -102,7 +94,6 @@ fn convert_to_elif(
     first: &Stmt,
     else_clause: &ElifElseClause,
     locator: &Locator,
-    indexer: &Indexer,
     stylist: &Stylist,
 ) -> Result<Fix> {
     let inner_if_line_start = locator.line_start(first.start());
@@ -118,7 +109,6 @@ fn convert_to_elif(
         TextRange::new(inner_if_line_start, inner_if_line_end),
         indentation,
         locator,
-        indexer,
         stylist,
     )?;
 
diff --git a/crates/ruff_linter/src/rules/pylint/rules/useless_else_on_loop.rs b/crates/ruff_linter/src/rules/pylint/rules/useless_else_on_loop.rs
@@ -6,7 +6,6 @@ use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::identifier;
 use ruff_python_ast::{self as ast, ExceptHandler, MatchCase, Stmt};
 use ruff_python_codegen::Stylist;
-use ruff_python_index::Indexer;
 use ruff_source_file::Locator;
 use ruff_text_size::{Ranged, TextRange};
 
@@ -82,7 +81,6 @@ pub(crate) fn useless_else_on_loop(
             orelse,
             else_range,
             checker.locator(),
-            checker.indexer(),
             checker.stylist(),
         )
     });
@@ -136,7 +134,6 @@ fn remove_else(
     orelse: &[Stmt],
     else_range: TextRange,
     locator: &Locator,
-    indexer: &Indexer,
     stylist: &Stylist,
 ) -> Result<Fix> {
     let Some(start) = orelse.first() else {
@@ -167,7 +164,6 @@ fn remove_else(
             ),
             desired_indentation,
             locator,
-            indexer,
             stylist,
         )?;
 
diff --git a/crates/ruff_linter/src/rules/pyupgrade/rules/outdated_version_block.rs b/crates/ruff_linter/src/rules/pyupgrade/rules/outdated_version_block.rs
@@ -304,7 +304,6 @@ fn fix_always_false_branch(
                                 ),
                                 indentation,
                                 checker.locator(),
-                                checker.indexer(),
                                 checker.stylist(),
                             )
                             .ok()
@@ -379,7 +378,6 @@ fn fix_always_true_branch(
                             TextRange::new(checker.locator().line_start(start.start()), end.end()),
                             indentation,
                             checker.locator(),
-                            checker.indexer(),
                             checker.stylist(),
                         )
                         .ok()
