Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-28 14:03:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove SyntaxPtr::range from more places

Browse source
This commit is contained in:
Aleksey Kladov 2020-04-23 16:33:01 +02:00
parent 0502be3bf4
commit 4176c03d12
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
crates/ra_hir_def/src/body/scope.rs
View file

@ -325,8 +325,11 @@ mod tests {
let resolved = scopes.resolve_name_in_scope(expr_scope, &name_ref.as_name()).unwrap(); let resolved = scopes.resolve_name_in_scope(expr_scope, &name_ref.as_name()).unwrap();
let pat_src = source_map.pat_syntax(resolved.pat()).unwrap(); let pat_src = source_map.pat_syntax(resolved.pat()).unwrap();
let local_name = pat_src.value.either(|it| it.syntax_node_ptr(), |it| it.syntax_node_ptr()); let local_name = pat_src.value.either(
assert_eq!(local_name.range(), expected_name.syntax().text_range()); |it| it.syntax_node_ptr().to_node(file.syntax()),
|it| it.syntax_node_ptr().to_node(file.syntax()),
);
assert_eq!(local_name.text_range(), expected_name.syntax().text_range());
} }
#[test] #[test]

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

@ -176,7 +176,7 @@ impl ToNav for FileSymbol {
file_id: self.file_id, file_id: self.file_id,
name: self.name.clone(), name: self.name.clone(),
kind: self.kind, kind: self.kind,
full_range: self.ptr.range(), full_range: self.range,
focus_range: self.name_range, focus_range: self.name_range,
container_name: self.container_name.clone(), container_name: self.container_name.clone(),
description: description_from_symbol(db, self), description: description_from_symbol(db, self),

2
crates/ra_ide_db/src/symbol_index.rs
View file

@ -313,6 +313,7 @@ pub struct FileSymbol {
pub file_id: FileId, pub file_id: FileId,
pub name: SmolStr, pub name: SmolStr,
pub kind: SyntaxKind, pub kind: SyntaxKind,
pub range: TextRange,
pub ptr: SyntaxNodePtr, pub ptr: SyntaxNodePtr,
pub name_range: Option<TextRange>, pub name_range: Option<TextRange>,
pub container_name: Option<SmolStr>, pub container_name: Option<SmolStr>,
@ -379,6 +380,7 @@ fn to_file_symbol(node: &SyntaxNode, file_id: FileId) -> Option<FileSymbol> {
to_symbol(node).map(move |(name, ptr, name_range)| FileSymbol { to_symbol(node).map(move |(name, ptr, name_range)| FileSymbol {
name, name,
kind: node.kind(), kind: node.kind(),
range: node.text_range(),
ptr, ptr,
file_id, file_id,
name_range: Some(name_range), name_range: Some(name_range),