Skip to content

Commit 537f4b2

Browse files
authored
Merge pull request rust-lang#18928 from roife/fix-18918
fix: handle character boundary in search mode
2 parents 2de7529 + 0d8015c commit 537f4b2

File tree

4 files changed

+5295
-1
lines changed

4 files changed

+5295
-1
lines changed

src/tools/rust-analyzer/crates/hir-def/src/import_map.rs

+19-1
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ impl SearchMode {
320320
};
321321
match m {
322322
Some((index, _)) => {
323-
name = &name[index + 1..];
323+
name = name[index..].strip_prefix(|_: char| true).unwrap_or_default();
324324
true
325325
}
326326
None => false,
@@ -1039,4 +1039,22 @@ pub mod fmt {
10391039
"#]],
10401040
);
10411041
}
1042+
1043+
#[test]
1044+
fn unicode_fn_name() {
1045+
let ra_fixture = r#"
1046+
//- /main.rs crate:main deps:dep
1047+
//- /dep.rs crate:dep
1048+
pub fn あい() {}
1049+
"#;
1050+
1051+
check_search(
1052+
ra_fixture,
1053+
"main",
1054+
Query::new("あ".to_owned()).fuzzy(),
1055+
expect![[r#"
1056+
dep::あい (f)
1057+
"#]],
1058+
);
1059+
}
10421060
}

0 commit comments

Comments
 (0)