Skip to content

Commit ad752bd

Browse files
committed
Auto merge of rust-lang#13301 - Veykril:empty-assist-source-changes, r=Veykril
Make assist tests panic again on empty source changes
2 parents 9ba55ba + f5fe6b1 commit ad752bd

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

crates/ide-assists/src/tests.rs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,10 @@ fn check_doc_test(assist_id: &str, before: &str, after: &str) {
9696
});
9797

9898
let actual = {
99-
let source_change =
100-
assist.source_change.expect("Assist did not contain any source changes");
99+
let source_change = assist
100+
.source_change
101+
.filter(|it| !it.source_file_edits.is_empty() || !it.file_system_edits.is_empty())
102+
.expect("Assist did not contain any source changes");
101103
let mut actual = before;
102104
if let Some(source_file_edit) = source_change.get_source_edit(file_id) {
103105
source_file_edit.apply(&mut actual);
@@ -140,8 +142,10 @@ fn check(handler: Handler, before: &str, expected: ExpectedResult<'_>, assist_la
140142

141143
match (assist, expected) {
142144
(Some(assist), ExpectedResult::After(after)) => {
143-
let source_change =
144-
assist.source_change.expect("Assist did not contain any source changes");
145+
let source_change = assist
146+
.source_change
147+
.filter(|it| !it.source_file_edits.is_empty() || !it.file_system_edits.is_empty())
148+
.expect("Assist did not contain any source changes");
145149
let skip_header = source_change.source_file_edits.len() == 1
146150
&& source_change.file_system_edits.len() == 0;
147151

0 commit comments

Comments
 (0)