Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-13 05:38:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

diagnostics is now a function

Browse source
This commit is contained in:
Aleksey Kladov 2019-02-08 14:30:21 +03:00
parent 8328e196dd
commit 884f04670a
2 changed files with 62 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,70 +2,68 @@ use hir::{Problem, source_binder};
use ra_ide_api_light::Severity; use ra_ide_api_light::Severity;
use ra_db::SourceDatabase; use ra_db::SourceDatabase;
use crate::{db, Diagnostic, FileId, FileSystemEdit, SourceChange}; use crate::{Diagnostic, FileId, FileSystemEdit, SourceChange, db::RootDatabase};
impl db::RootDatabase { pub(crate) fn diagnostics(db: &RootDatabase, file_id: FileId) -> Vec<Diagnostic> {
pub(crate) fn diagnostics(&self, file_id: FileId) -> Vec<Diagnostic> { let syntax = db.parse(file_id);
let syntax = self.parse(file_id);
let mut res = ra_ide_api_light::diagnostics(&syntax) let mut res = ra_ide_api_light::diagnostics(&syntax)
.into_iter() .into_iter()
.map(|d| Diagnostic { .map(|d| Diagnostic {
range: d.range, range: d.range,
message: d.msg, message: d.msg,
severity: d.severity, severity: d.severity,
fix: d.fix.map(|fix| SourceChange::from_local_edit(file_id, fix)), fix: d.fix.map(|fix| SourceChange::from_local_edit(file_id, fix)),
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
if let Some(m) = source_binder::module_from_file_id(self, file_id) { if let Some(m) = source_binder::module_from_file_id(db, file_id) {
for (name_node, problem) in m.problems(self) { for (name_node, problem) in m.problems(db) {
let source_root = self.file_source_root(file_id); let source_root = db.file_source_root(file_id);
let diag = match problem { let diag = match problem {
Problem::UnresolvedModule { candidate } => { Problem::UnresolvedModule { candidate } => {
let create_file = FileSystemEdit::CreateFile { let create_file = FileSystemEdit::CreateFile {
source_root, source_root,
path: candidate.clone(), path: candidate.clone(),
}; };
let fix = SourceChange { let fix = SourceChange {
label: "create module".to_string(), label: "create module".to_string(),
source_file_edits: Vec::new(), source_file_edits: Vec::new(),
file_system_edits: vec![create_file], file_system_edits: vec![create_file],
cursor_position: None, cursor_position: None,
}; };
Diagnostic { Diagnostic {
range: name_node.range(), range: name_node.range(),
message: "unresolved module".to_string(), message: "unresolved module".to_string(),
severity: Severity::Error, severity: Severity::Error,
fix: Some(fix), fix: Some(fix),
}
} }
Problem::NotDirOwner { move_to, candidate } => { }
let move_file = FileSystemEdit::MoveFile { Problem::NotDirOwner { move_to, candidate } => {
src: file_id, let move_file = FileSystemEdit::MoveFile {
dst_source_root: source_root, src: file_id,
dst_path: move_to.clone(), dst_source_root: source_root,
}; dst_path: move_to.clone(),
let create_file = FileSystemEdit::CreateFile { };
source_root, let create_file = FileSystemEdit::CreateFile {
path: move_to.join(candidate), source_root,
}; path: move_to.join(candidate),
let fix = SourceChange { };
label: "move file and create module".to_string(), let fix = SourceChange {
source_file_edits: Vec::new(), label: "move file and create module".to_string(),
file_system_edits: vec![move_file, create_file], source_file_edits: Vec::new(),
cursor_position: None, file_system_edits: vec![move_file, create_file],
}; cursor_position: None,
Diagnostic { };
range: name_node.range(), Diagnostic {
message: "can't declare module at this location".to_string(), range: name_node.range(),
severity: Severity::Error, message: "can't declare module at this location".to_string(),
fix: Some(fix), severity: Severity::Error,
} fix: Some(fix),
} }
}; }
res.push(diag) };
} res.push(diag)
}; }
res };
} res
} }

4
crates/ra_ide_api/src/lib.rs
View file

@ -52,10 +52,10 @@ use crate::{
}; };
pub use crate::{ pub use crate::{
change::{AnalysisChange, LibraryData},
completion::{CompletionItem, CompletionItemKind, InsertTextFormat}, completion::{CompletionItem, CompletionItemKind, InsertTextFormat},
runnables::{Runnable, RunnableKind}, runnables::{Runnable, RunnableKind},
navigation_target::NavigationTarget, navigation_target::NavigationTarget,
change::{AnalysisChange, LibraryData},
}; };
pub use ra_ide_api_light::{ pub use ra_ide_api_light::{
Fold, FoldKind, HighlightedRange, Severity, StructureNode, LocalEdit, Fold, FoldKind, HighlightedRange, Severity, StructureNode, LocalEdit,
@ -373,7 +373,7 @@ impl Analysis {
/// Computes the set of diagnostics for the given file. /// Computes the set of diagnostics for the given file.
pub fn diagnostics(&self, file_id: FileId) -> Cancelable<Vec<Diagnostic>> { pub fn diagnostics(&self, file_id: FileId) -> Cancelable<Vec<Diagnostic>> {
self.with_db(|db| db.diagnostics(file_id)) self.with_db(|db| diagnostics::diagnostics(db, file_id))
} }
/// Computes the type of the expression at the given position. /// Computes the type of the expression at the given position.