@@ -59,12 +59,9 @@ use std::sync::Arc;
5959
6060use hir_expand:: { diagnostics:: DiagnosticSink , name:: Name , InFile } ;
6161use ra_arena:: Arena ;
62- use ra_db:: { CrateId , Edition , FileId , FilePosition } ;
62+ use ra_db:: { CrateId , Edition , FileId } ;
6363use ra_prof:: profile;
64- use ra_syntax:: {
65- ast:: { self , AstNode } ,
66- SyntaxNode ,
67- } ;
64+ use ra_syntax:: ast;
6865use rustc_hash:: FxHashMap ;
6966
7067use crate :: {
@@ -255,35 +252,6 @@ pub enum ModuleSource {
255252 Module ( ast:: Module ) ,
256253}
257254
258- impl ModuleSource {
259- // FIXME: this methods do not belong here
260- pub fn from_position ( db : & impl DefDatabase , position : FilePosition ) -> ModuleSource {
261- let parse = db. parse ( position. file_id ) ;
262- match & ra_syntax:: algo:: find_node_at_offset :: < ast:: Module > (
263- parse. tree ( ) . syntax ( ) ,
264- position. offset ,
265- ) {
266- Some ( m) if !m. has_semi ( ) => ModuleSource :: Module ( m. clone ( ) ) ,
267- _ => {
268- let source_file = parse. tree ( ) ;
269- ModuleSource :: SourceFile ( source_file)
270- }
271- }
272- }
273-
274- pub fn from_child_node ( db : & impl DefDatabase , child : InFile < & SyntaxNode > ) -> ModuleSource {
275- if let Some ( m) =
276- child. value . ancestors ( ) . filter_map ( ast:: Module :: cast) . find ( |it| !it. has_semi ( ) )
277- {
278- ModuleSource :: Module ( m)
279- } else {
280- let file_id = child. file_id . original_file ( db) ;
281- let source_file = db. parse ( file_id) . tree ( ) ;
282- ModuleSource :: SourceFile ( source_file)
283- }
284- }
285- }
286-
287255mod diagnostics {
288256 use hir_expand:: diagnostics:: DiagnosticSink ;
289257 use ra_db:: RelativePathBuf ;
0 commit comments