Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/ide-db/src/imports/merge_imports.rs')
| -rw-r--r-- | crates/ide-db/src/imports/merge_imports.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crates/ide-db/src/imports/merge_imports.rs b/crates/ide-db/src/imports/merge_imports.rs index 740c50f79f..f647896bf6 100644 --- a/crates/ide-db/src/imports/merge_imports.rs +++ b/crates/ide-db/src/imports/merge_imports.rs @@ -9,7 +9,7 @@ use syntax::{ algo, ast::{self, make, AstNode, HasAttrs, HasName, HasVisibility, PathSegmentKind}, ted::{self, Position}, - Direction, TokenText, + Direction, }; use crate::syntax_helpers::node_ext::vis_eq; @@ -339,8 +339,8 @@ fn path_segment_cmp(a: &ast::PathSegment, b: &ast::PathSegment) -> Ordering { (None, Some(_)) => Ordering::Less, (Some(a_name), Some(b_name)) => { // snake_case < CamelCase < UPPER_SNAKE_CASE - let a_text = a_name.as_str(); - let b_text = b_name.as_str(); + let a_text = a_name.as_str().trim_start_matches("r#"); + let b_text = b_name.as_str().trim_start_matches("r#"); if a_text.starts_with(char::is_lowercase) && b_text.starts_with(char::is_uppercase) { @@ -388,14 +388,14 @@ fn use_tree_cmp_by_tree_list_glob_or_alias( .as_ref() .map(ast::Name::text) .as_ref() - .map_or("_", TokenText::as_str) + .map_or("_", |a_name| a_name.as_str().trim_start_matches("r#")) .cmp( b_rename .name() .as_ref() .map(ast::Name::text) .as_ref() - .map_or("_", TokenText::as_str), + .map_or("_", |b_name| b_name.as_str().trim_start_matches("r#")), ), }, }; |