Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/ide/src/typing/on_enter.rs')
-rw-r--r--crates/ide/src/typing/on_enter.rs10
1 files changed, 7 insertions, 3 deletions
diff --git a/crates/ide/src/typing/on_enter.rs b/crates/ide/src/typing/on_enter.rs
index c6d1c283f4..8cadb61040 100644
--- a/crates/ide/src/typing/on_enter.rs
+++ b/crates/ide/src/typing/on_enter.rs
@@ -1,8 +1,8 @@
//! Handles the `Enter` key press. At the momently, this only continues
//! comments, but should handle indent some time in the future as well.
-use ide_db::RootDatabase;
-use ide_db::{base_db::SourceDatabase, FilePosition};
+use ide_db::base_db::RootQueryDb;
+use ide_db::{base_db::salsa::AsDynDatabase, FilePosition, RootDatabase};
use span::EditionedFileId;
use syntax::{
algo::find_node_at_offset,
@@ -51,7 +51,11 @@ use ide_db::text_edit::TextEdit;
//
// ![On Enter](https://user-images.githubusercontent.com/48062697/113065578-04c21800-91b1-11eb-82b8-22b8c481e645.gif)
pub(crate) fn on_enter(db: &RootDatabase, position: FilePosition) -> Option<TextEdit> {
- let parse = db.parse(EditionedFileId::current_edition(position.file_id));
+ let editioned_file_id_wrapper = ide_db::base_db::EditionedFileId::new(
+ db.as_dyn_database(),
+ EditionedFileId::current_edition(position.file_id),
+ );
+ let parse = db.parse(editioned_file_id_wrapper);
let file = parse.tree();
let token = file.syntax().token_at_offset(position.offset).left_biased()?;