rust-analyzer

Unnamed repository; edit this file 'description' to name the repository.

Clone

HTTPS

SSH

Diffstat (limited to 'crates/ide/src/signature_help.rs')

-rw-r--r--

1 files changed, 4 insertions, 3 deletions

diff --git a/crates/ide/src/signature_help.rs b/crates/ide/src/signature_help.rs
index 44a1f2d97a..0e17b35590 100644
--- a/crates/ide/src/signature_help.rs
+++ b/crates/ide/src/signature_help.rs

@@ -85,7 +85,7 @@ pub(crate) fn signature_help(

.and_then(|tok| algo::skip_trivia_token(tok, Direction::Prev))?;

let token = sema.descend_into_macros_single_exact(token);

let edition =

- sema.attach_first_edition(file_id).map(|it| it.edition()).unwrap_or(Edition::CURRENT);

+ sema.attach_first_edition(file_id).map(|it| it.edition(db)).unwrap_or(Edition::CURRENT);

let display_target = sema.first_crate(file_id)?.to_display_target(db);

for node in token.parent_ancestors() {

@@ -744,13 +744,14 @@ mod tests {

pub(crate) fn position(

#[rust_analyzer::rust_fixture] ra_fixture: &str,

) -> (RootDatabase, FilePosition) {

- let change_fixture = ChangeFixture::parse(ra_fixture);

let mut database = RootDatabase::default();

+ let change_fixture = ChangeFixture::parse(&database, ra_fixture);

database.apply_change(change_fixture.change);

let (file_id, range_or_offset) =

change_fixture.file_position.expect("expected a marker ($0)");

let offset = range_or_offset.expect_offset();

- (database, FilePosition { file_id: file_id.into(), offset })

+ let position = FilePosition { file_id: file_id.file_id(&database), offset };

+ (database, position)

}

#[track_caller]