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

make AstId untyped

Browse source
This commit is contained in:
Aleksey Kladov 2019-05-13 19:39:06 +03:00
parent 033a32f349
commit 549728bba8
11 changed files with 29 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -54,7 +54,7 @@ pub(crate) fn diagnostics(db: &RootDatabase, file_id: FileId) -> Vec<Diagnostic>
let file_id = d.file().original_file(db);
let source_file = db.parse(file_id);
let syntax_node = d.syntax_node_ptr();
let node = NamedFieldList::cast(syntax_node.to_node(&source_file)).unwrap();
let node = NamedFieldList::cast(syntax_node.to_node(source_file.syntax())).unwrap();
let mut ast_editor = AstEditor::new(node);
for f in d.missed_fields.iter() {
ast_editor.append_field(&AstBuilder::<NamedField>::from_name(f));
@ -281,7 +281,7 @@ mod tests {
one: i32,
two: i64,
}
fn test_fn() {
let one = 1;
let s = TestStruct{ one, two: 2 };
@ -298,7 +298,7 @@ mod tests {
one: i32,
two: i64,
}
fn test_fn() {
let one = 1;
let s = TestStruct{ ..a };

2
crates/ra_ide_api/src/display/navigation_target.rs
View file

@ -81,7 +81,7 @@ impl NavigationTarget {
) -> NavigationTarget {
let file = db.parse(file_id);
let (name, full_range) = match pat {
Either::A(pat) => match pat.to_node(&file).kind() {
Either::A(pat) => match pat.to_node(file.syntax()).kind() {
ast::PatKind::BindPat(pat) => {
return NavigationTarget::from_bind_pat(file_id, &pat)
}

2
crates/ra_ide_api/src/references.rs
View file

@ -86,7 +86,7 @@ pub(crate) fn find_all_refs(
let analyzer = hir::SourceAnalyzer::new(db, position.file_id, name_ref.syntax(), None);
let resolved = analyzer.resolve_local_name(name_ref)?;
if let Either::A(ptr) = resolved.ptr() {
if let ast::PatKind::BindPat(binding) = ptr.to_node(source_file).kind() {
if let ast::PatKind::BindPat(binding) = ptr.to_node(source_file.syntax()).kind() {
return Some((binding, analyzer));
}
}