From 595b06a1b8fcd215c828d65ee1dd1a30c2697de9 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 16 Jan 2020 17:33:07 +0100 Subject: Create modules via SourceBinder --- crates/ra_ide/src/completion/completion_context.rs | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'crates/ra_ide/src/completion/completion_context.rs') diff --git a/crates/ra_ide/src/completion/completion_context.rs b/crates/ra_ide/src/completion/completion_context.rs index 48d69f7e5..deaacda6c 100644 --- a/crates/ra_ide/src/completion/completion_context.rs +++ b/crates/ra_ide/src/completion/completion_context.rs @@ -52,15 +52,11 @@ impl<'a> CompletionContext<'a> { original_parse: &'a Parse, position: FilePosition, ) -> Option> { - let src = hir::ModuleSource::from_position(db, position); - let module = hir::Module::from_definition( - db, - hir::InFile { file_id: position.file_id.into(), value: src }, - ); + let mut sb = hir::SourceBinder::new(db); + let module = sb.to_module_def(position.file_id); let token = original_parse.tree().syntax().token_at_offset(position.offset).left_biased()?; - let analyzer = hir::SourceAnalyzer::new( - db, + let analyzer = sb.analyze( hir::InFile::new(position.file_id.into(), &token.parent()), Some(position.offset), ); -- cgit v1.2.3