Skip to content

Commit 64e1a58

Browse files
committed
Only remove method from end of recv, indent suggestion source
1 parent 909379d commit 64e1a58

File tree

1 file changed

+18
-8
lines changed

1 file changed

+18
-8
lines changed

clippy_lints/src/methods/case_sensitive_file_extension_comparisons.rs

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
use clippy_utils::diagnostics::span_lint_and_then;
2+
use clippy_utils::source::{indent_of, reindent_multiline};
23
use clippy_utils::sugg::Sugg;
34
use clippy_utils::ty::is_type_lang_item;
45
use if_chain::if_chain;
@@ -43,23 +44,32 @@ pub(super) fn check<'tcx>(
4344
recv_str = format!("&{recv_str}");
4445
}
4546

46-
if recv_str.contains(".to_lowercase()") {
47+
if recv_str.ends_with(".to_lowercase()") {
4748
diag.note("to_lowercase allocates memory, this can be avoided by using Path");
48-
recv_str = recv_str.replace(".to_lowercase()", "");
49+
let (prefix, _) = recv_str.split_at(recv_str.len() - ".to_lowercase()".len());
50+
recv_str = prefix.to_string();
4951
}
5052

51-
if recv_str.contains(".to_uppercase()") {
53+
if recv_str.ends_with(".to_uppercase()") {
5254
diag.note("to_uppercase allocates memory, this can be avoided by using Path");
53-
recv_str = recv_str.replace(".to_uppercase()", "");
55+
let (prefix, _) = recv_str.split_at(recv_str.len() - ".to_uppercase()".len());
56+
recv_str = prefix.to_string();
5457
}
5558

59+
let suggestion_source: String = reindent_multiline(
60+
format!(
61+
"std::path::Path::new({})
62+
.extension()
63+
.map_or(false, |ext| ext.eq_ignore_ascii_case(\"{}\"))",
64+
recv_str, ext_str.strip_prefix('.').unwrap()).into(),
65+
true,
66+
Some(indent_of(cx, call_span).unwrap_or(0) + 4)
67+
).to_string();
68+
5669
diag.span_suggestion(
5770
recv.span.to(call_span),
5871
"use std::path::Path",
59-
format!("std::path::Path::new({})
60-
.extension()
61-
.map_or(false, |ext| ext.eq_ignore_ascii_case(\"{}\"))",
62-
recv_str, ext_str.strip_prefix('.').unwrap()),
72+
suggestion_source,
6373
Applicability::MaybeIncorrect,
6474
);
6575
}

0 commit comments

Comments
 (0)