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

use correct file for diagnostics

Browse source 
closes #1475
This commit is contained in:
Aleksey Kladov 2019-07-05 19:40:02 +03:00
parent fd30ec406b
commit 0b5e399190
2 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
use std::cell::RefCell;
use hir::{
diagnostics::{Diagnostic as _, DiagnosticSink},
diagnostics::{AstDiagnostic, Diagnostic as _, DiagnosticSink},
source_binder,
};
use itertools::Itertools;
@ -9,7 +9,7 @@ use ra_assists::ast_editor::{AstBuilder, AstEditor};
use ra_db::SourceDatabase;
use ra_prof::profile;
use ra_syntax::{
ast::{self, AstNode, NamedField, NamedFieldList},
ast::{self, AstNode, NamedField},
Location, SyntaxNode, TextRange, T,
};
use ra_text_edit::{TextEdit, TextEditBuilder};
@ -34,9 +34,7 @@ pub(crate) fn diagnostics(db: &RootDatabase, file_id: FileId) -> Vec<Diagnostic>
fix: None,
}));
let source_file = parse.tree;
for node in source_file.syntax().descendants() {
for node in parse.tree.syntax().descendants() {
check_unnecessary_braces_in_use_statement(&mut res, file_id, node);
check_struct_shorthand_initialization(&mut res, file_id, node);
}
@ -61,9 +59,8 @@ pub(crate) fn diagnostics(db: &RootDatabase, file_id: FileId) -> Vec<Diagnostic>
})
})
.on::<hir::diagnostics::MissingFields, _>(|d| {
let syntax_node = d.syntax_node_ptr();
let node = NamedFieldList::cast(syntax_node.to_node(source_file.syntax())).unwrap();
let mut ast_editor = AstEditor::new(node);
let node = d.ast(db);
let mut ast_editor = AstEditor::new(&*node);
for f in d.missed_fields.iter() {
ast_editor.append_field(&AstBuilder::<NamedField>::from_name(f));
}