mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use version-sort when reordering imports using style_edition=2024

Browse Source
This commit is contained in:
Yacin Tmimi 2024-07-09 02:28:11 -04:00
parent 1681c91a35
commit 296417260c
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/imports.rs
View File

@ -21,6 +21,7 @@ use crate::lists::{
}; };
use crate::rewrite::{Rewrite, RewriteContext, RewriteErrorExt, RewriteResult}; use crate::rewrite::{Rewrite, RewriteContext, RewriteErrorExt, RewriteResult};
use crate::shape::Shape; use crate::shape::Shape;
use crate::sort::version_sort;
use crate::source_map::SpanUtils; use crate::source_map::SpanUtils;
use crate::spanned::Spanned; use crate::spanned::Spanned;
use crate::utils::{is_same_visibility, mk_sp, rewrite_ident}; use crate::utils::{is_same_visibility, mk_sp, rewrite_ident};
@ -923,7 +924,7 @@ impl Ord for UseSegment {
| (Crate(ref a), Crate(ref b)) => match (a, b) { | (Crate(ref a), Crate(ref b)) => match (a, b) {
(Some(sa), Some(sb)) => { (Some(sa), Some(sb)) => {
if self.style_edition >= StyleEdition::Edition2024 { if self.style_edition >= StyleEdition::Edition2024 {
sa.trim_start_matches("r#").cmp(sb.trim_start_matches("r#")) version_sort(sa.trim_start_matches("r#"), sb.trim_start_matches("r#"))
} else { } else {
a.cmp(b) a.cmp(b)
} }
@ -937,20 +938,26 @@ impl Ord for UseSegment {
} else { } else {
(pia.as_str(), pib.as_str()) (pia.as_str(), pib.as_str())
}; };
// snake_case < CamelCase < UPPER_SNAKE_CASE
if ia.starts_with(char::is_uppercase) && ib.starts_with(char::is_lowercase) { let ident_ord = if self.style_edition >= StyleEdition::Edition2024 {
return Ordering::Greater; version_sort(ia, ib)
} } else {
if ia.starts_with(char::is_lowercase) && ib.starts_with(char::is_uppercase) { // snake_case < CamelCase < UPPER_SNAKE_CASE
return Ordering::Less; if ia.starts_with(char::is_uppercase) && ib.starts_with(char::is_lowercase) {
} return Ordering::Greater;
if is_upper_snake_case(ia) && !is_upper_snake_case(ib) { }
return Ordering::Greater; if ia.starts_with(char::is_lowercase) && ib.starts_with(char::is_uppercase) {
} return Ordering::Less;
if !is_upper_snake_case(ia) && is_upper_snake_case(ib) { }
return Ordering::Less; if is_upper_snake_case(ia) && !is_upper_snake_case(ib) {
} return Ordering::Greater;
let ident_ord = ia.cmp(ib); }
if !is_upper_snake_case(ia) && is_upper_snake_case(ib) {
return Ordering::Less;
}
ia.cmp(ib)
};
if ident_ord != Ordering::Equal { if ident_ord != Ordering::Equal {
return ident_ord; return ident_ord;
} }
@ -959,8 +966,7 @@ impl Ord for UseSegment {
(Some(_), None) => Ordering::Greater, (Some(_), None) => Ordering::Greater,
(Some(aas), Some(abs)) => { (Some(aas), Some(abs)) => {
if self.style_edition >= StyleEdition::Edition2024 { if self.style_edition >= StyleEdition::Edition2024 {
aas.trim_start_matches("r#") version_sort(aas.trim_start_matches("r#"), abs.trim_start_matches("r#"))
.cmp(abs.trim_start_matches("r#"))
} else { } else {
aas.cmp(abs) aas.cmp(abs)
} }