Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/ide-assists/src/assist_context.rs')
-rw-r--r--crates/ide-assists/src/assist_context.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/crates/ide-assists/src/assist_context.rs b/crates/ide-assists/src/assist_context.rs
index c459cdb735..1d2d3350f7 100644
--- a/crates/ide-assists/src/assist_context.rs
+++ b/crates/ide-assists/src/assist_context.rs
@@ -1,8 +1,8 @@
//! See [`AssistContext`].
-use hir::Semantics;
-use ide_db::base_db::{FileId, FileRange};
-use ide_db::{label::Label, RootDatabase};
+use hir::{FileRange, Semantics};
+use ide_db::EditionedFileId;
+use ide_db::{label::Label, FileId, RootDatabase};
use syntax::{
algo::{self, find_node_at_offset, find_node_at_range},
AstNode, AstToken, Direction, SourceFile, SyntaxElement, SyntaxKind, SyntaxToken, TextRange,
@@ -90,7 +90,7 @@ impl<'a> AssistContext<'a> {
self.frange.range.start()
}
- pub(crate) fn file_id(&self) -> FileId {
+ pub(crate) fn file_id(&self) -> EditionedFileId {
self.frange.file_id
}
@@ -139,7 +139,7 @@ impl Assists {
pub(crate) fn new(ctx: &AssistContext<'_>, resolve: AssistResolveStrategy) -> Assists {
Assists {
resolve,
- file: ctx.frange.file_id,
+ file: ctx.frange.file_id.file_id(),
buf: Vec::new(),
allowed: ctx.config.allowed.clone(),
}