language-servers/SpacemanDMM
1
0
Fork 0
mirror of https://github.com/SpaceManiac/SpacemanDMM.git synced 2025-12-23 05:36:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle duplicate variable names (Auxtools)

Browse source
This commit is contained in:
Tad Hardesty 2020-11-27 17:43:07 -08:00
parent c93661f3d1
commit ba5dde55df
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/langserver/debugger/mod.rs
View file

@ -1197,13 +1197,18 @@ handle_request! {
let aux_variables = auxtools.get_variables(auxtools_types::VariablesRef(params.variablesReference as i32))?;
let mut variables = vec![];
// TODO
// If VSC receives two Variables with the same name, it only
// displays the first one. Avert this by adding suffixes.
let mut seen = std::collections::HashMap::new();
for aux_var in aux_variables {
let name = match seen.entry(aux_var.name.clone()).and_modify(|e| *e += 1).or_default() {
0 => aux_var.name,
n => format!("{} #{}", aux_var.name, n),
};
variables.push(Variable {
name: aux_var.name,
name,
value: aux_var.value,
variablesReference: aux_var.variables.map(|x| x.0 as i64).unwrap_or(0),
.. Default::default()