language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 15:15:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Make nameresolution resilient to reparsing

Browse source 
We now store item id's instead of local syntax ptrs, and item ids
don't change if you type inside a single function.
This commit is contained in:
Aleksey Kladov 2018-11-27 14:11:36 +03:00
parent 4d87799a4a
commit 10f4d4b74c
6 changed files with 139 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

19
crates/ra_analysis/src/descriptors/path.rs
View file

@ -1,6 +1,4 @@
use ra_syntax::{SmolStr, ast, AstNode};
use crate::syntax_ptr::LocalSyntaxPtr;
use ra_syntax::{SmolStr, ast, AstNode, TextRange};
#[derive(Debug, Clone, PartialEq, Eq)]
pub(crate) struct Path {
@ -18,10 +16,7 @@ pub(crate) enum PathKind {
impl Path {
/// Calls `cb` with all paths, represented by this use item.
pub(crate) fn expand_use_item(
item: ast::UseItem,
mut cb: impl FnMut(Path, Option<LocalSyntaxPtr>),
) {
pub(crate) fn expand_use_item(item: ast::UseItem, mut cb: impl FnMut(Path, Option<TextRange>)) {
if let Some(tree) = item.use_tree() {
expand_use_tree(None, tree, &mut cb);
}
@ -77,7 +72,7 @@ impl Path {
fn expand_use_tree(
prefix: Option<Path>,
tree: ast::UseTree,
cb: &mut impl FnMut(Path, Option<LocalSyntaxPtr>),
cb: &mut impl FnMut(Path, Option<TextRange>),
) {
if let Some(use_tree_list) = tree.use_tree_list() {
let prefix = match tree.path() {
@ -93,13 +88,13 @@ fn expand_use_tree(
} else {
if let Some(ast_path) = tree.path() {
if let Some(path) = convert_path(prefix, ast_path) {
let ptr = if tree.has_star() {
let range = if tree.has_star() {
None
} else {
let ptr = LocalSyntaxPtr::new(ast_path.segment().unwrap().syntax());
Some(ptr)
let range = ast_path.segment().unwrap().syntax().range();
Some(range)
};
cb(path, ptr)
cb(path, range)
}
}
}