language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 12:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge #8559

Browse source 
8559: Add some more error messages to fixture failure cases r=Veykril a=Veykril

Follow up for #8557
bors r+

Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
This commit is contained in:
bors[bot] 2021-04-17 19:37:59 +00:00 • committed by GitHub
commit 19fc1f333f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/base_db/src/fixture.rs
View file

@ -35,7 +35,7 @@ pub trait WithFixture: Default + SourceDatabaseExt + 'static {
fn with_position(ra_fixture: &str) -> (Self, FilePosition) { fn with_position(ra_fixture: &str) -> (Self, FilePosition) {
let (db, file_id, range_or_offset) = Self::with_range_or_offset(ra_fixture); let (db, file_id, range_or_offset) = Self::with_range_or_offset(ra_fixture);
let offset = match range_or_offset { let offset = match range_or_offset {
RangeOrOffset::Range(_) => panic!(), RangeOrOffset::Range(_) => panic!("Expected a cursor position, got a range instead"),
RangeOrOffset::Offset(it) => it, RangeOrOffset::Offset(it) => it,
}; };
(db, FilePosition { file_id, offset }) (db, FilePosition { file_id, offset })
@ -45,7 +45,7 @@ pub trait WithFixture: Default + SourceDatabaseExt + 'static {
let (db, file_id, range_or_offset) = Self::with_range_or_offset(ra_fixture); let (db, file_id, range_or_offset) = Self::with_range_or_offset(ra_fixture);
let range = match range_or_offset { let range = match range_or_offset {
RangeOrOffset::Range(it) => it, RangeOrOffset::Range(it) => it,
RangeOrOffset::Offset(_) => panic!(), RangeOrOffset::Offset(_) => panic!("Expected a cursor range, got a position instead"),
}; };
(db, FileRange { file_id, range }) (db, FileRange { file_id, range })
} }

6
crates/ide_assists/src/tests.rs
View file

@ -84,7 +84,8 @@ fn check_doc_test(assist_id: &str, before: &str, after: &str) {
}); });
let actual = { let actual = {
let source_change = assist.source_change.unwrap(); let source_change =
assist.source_change.expect("Assist did not contain any source changes");
let mut actual = before; let mut actual = before;
if let Some(source_file_edit) = source_change.get_source_edit(file_id) { if let Some(source_file_edit) = source_change.get_source_edit(file_id) {
source_file_edit.apply(&mut actual); source_file_edit.apply(&mut actual);
@ -121,7 +122,8 @@ fn check(handler: Handler, before: &str, expected: ExpectedResult, assist_label:
match (assist, expected) { match (assist, expected) {
(Some(assist), ExpectedResult::After(after)) => { (Some(assist), ExpectedResult::After(after)) => {
let source_change = assist.source_change.unwrap(); let source_change =
assist.source_change.expect("Assist did not contain any source changes");
assert!(!source_change.source_file_edits.is_empty()); assert!(!source_change.source_file_edits.is_empty());
let skip_header = source_change.source_file_edits.len() == 1 let skip_header = source_change.source_file_edits.len() == 1
&& source_change.file_system_edits.len() == 0; && source_change.file_system_edits.len() == 0;