language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 21:05:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

tt-attrs

Browse source
This commit is contained in:
Aleksey Kladov 2018-08-16 12:51:40 +03:00
parent 1193c5f829
commit 7094291573
18 changed files with 260 additions and 276 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/libanalysis/src/lib.rs
View file

@ -26,9 +26,8 @@ use std::{
use libsyntax2::{
TextUnit,
ast::{self, AstNode},
algo::{find_leaf_at_offset, ancestors},
};
use libeditor::{LineIndex, FileSymbol};
use libeditor::{LineIndex, FileSymbol, find_node};
use self::symbol_index::FileSymbols;
pub use self::symbol_index::Query;
@ -123,13 +122,7 @@ impl World {
let file = self.file_syntax(id)?;
let syntax = file.syntax();
let syntax = syntax.as_ref();
let name_ref =
find_leaf_at_offset(syntax, offset)
.left_biased()
.into_iter()
.flat_map(|node| ancestors(node))
.flat_map(ast::NameRef::cast)
.next();
let name_ref = find_node::<ast::NameRef<_>>(syntax, offset);
let name = match name_ref {
None => return Ok(vec![]),
Some(name_ref) => name_ref.text(),