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

scip: Populate SymbolInformation::enclosing_symbol

Browse source 
For local variables, this gets the moniker from the enclosing
definition and stores it into the TokenStaticData.
Then it builds the scip symbol for that moniker when building the
SymbolInformation.
This commit is contained in:
Nicolas Guichard 2023-12-05 18:29:48 +01:00
parent 62663e6d4b
commit 495a55689b
3 changed files with 40 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/rust-analyzer/src/cli/scip.rs
View file

@ -78,6 +78,7 @@ impl flags::Scip {
let mut symbols_emitted: HashSet<TokenId> = HashSet::default();
let mut tokens_to_symbol: HashMap<TokenId, String> = HashMap::new();
let mut tokens_to_enclosing_symbol: HashMap<TokenId, Option<String>> = HashMap::new();
for StaticIndexedFile { file_id, tokens, .. } in si.files {
let mut local_count = 0;
@ -117,6 +118,16 @@ impl flags::Scip {
scip::symbol::format_symbol(symbol)
})
.clone();
let enclosing_symbol = tokens_to_enclosing_symbol
.entry(id)
.or_insert_with(|| {
token
.enclosing_moniker
.as_ref()
.map(moniker_to_symbol)
.map(scip::symbol::format_symbol)
})
.clone();
let mut symbol_roles = Default::default();
@ -140,7 +151,7 @@ impl flags::Scip {
kind: Default::default(),
display_name: token.display_name.clone().unwrap_or_default(),
signature_documentation: Default::default(),
enclosing_symbol: String::new(),
enclosing_symbol: enclosing_symbol.unwrap_or_default(),
};
symbols.push(symbol_info)