language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 05:45:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

remove last traces of source roots from hir

Browse source
This commit is contained in:
Aleksey Kladov 2019-10-09 14:27:37 +03:00
parent 3b4c506f33
commit e44c7ce200
5 changed files with 71 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/ra_ide_api/src/diagnostics.rs
View file

@ -12,6 +12,7 @@ use ra_syntax::{
Location, SyntaxNode, TextRange, T,
};
use ra_text_edit::{TextEdit, TextEditBuilder};
use relative_path::RelativePath;
use crate::{db::RootDatabase, Diagnostic, FileId, FileSystemEdit, SourceChange, SourceFileEdit};
@ -47,8 +48,14 @@ pub(crate) fn diagnostics(db: &RootDatabase, file_id: FileId) -> Vec<Diagnostic>
})
})
.on::<hir::diagnostics::UnresolvedModule, _>(|d| {
let source_root = db.file_source_root(d.source().file_id.original_file(db));
let create_file = FileSystemEdit::CreateFile { source_root, path: d.candidate.clone() };
let original_file = d.source().file_id.original_file(db);
let source_root = db.file_source_root(original_file);
let path = db
.file_relative_path(original_file)
.parent()
.unwrap_or_else(|| RelativePath::new(""))
.join(&d.candidate);
let create_file = FileSystemEdit::CreateFile { source_root, path };
let fix = SourceChange::file_system_edit("create module", create_file);
res.borrow_mut().push(Diagnostic {
range: d.highlight_range(),