Unnamed repository; edit this file 'description' to name the repository.
Merge pull request #22892 from Wilfred/fix/merge-imports-malformed-paths
fix: merge_imports panic on invalid paths
| -rw-r--r-- | crates/ide-assists/src/handlers/merge_imports.rs | 11 | ||||
| -rw-r--r-- | crates/ide-db/src/imports/merge_imports.rs | 4 |
2 files changed, 14 insertions, 1 deletions
diff --git a/crates/ide-assists/src/handlers/merge_imports.rs b/crates/ide-assists/src/handlers/merge_imports.rs index 2d3b1b0540..a4edb556d4 100644 --- a/crates/ide-assists/src/handlers/merge_imports.rs +++ b/crates/ide-assists/src/handlers/merge_imports.rs @@ -838,4 +838,15 @@ use foo::$0; ", ); } + + #[test] + fn test_merge_with_malformed_colon_path_segment() { + check_assist_not_applicable( + merge_imports, + r" +use foo::bar; +use foo::$0:; +", + ); + } } diff --git a/crates/ide-db/src/imports/merge_imports.rs b/crates/ide-db/src/imports/merge_imports.rs index 17fae61da6..59099056f5 100644 --- a/crates/ide-db/src/imports/merge_imports.rs +++ b/crates/ide-db/src/imports/merge_imports.rs @@ -828,7 +828,9 @@ fn split_prefix( } } else { let suffix_segments: Vec<_> = path.segments().skip(prefix.segments().count()).collect(); - if suffix_segments.is_empty() { + if suffix_segments.is_empty() + || suffix_segments.iter().any(|segment| segment.kind().is_none()) + { return None; } let suffix_path = make.path_from_segments(suffix_segments, false); |