mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Preserve relative ordering of grouped assists

Browse Source
This commit is contained in:
Aleksey Kladov 2020-03-25 15:45:52 +01:00
parent 785eb32f49
commit b3665fccfb
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
crates/rust-analyzer/src/main_loop/handlers.rs
View File

@ -734,19 +734,29 @@ pub fn handle_code_action(
res.push(fix.action.clone());
}
let mut grouped_assists: FxHashMap<String, Vec<Assist>> = FxHashMap::default();
let mut grouped_assists: FxHashMap<String, (usize, Vec<Assist>)> = FxHashMap::default();
for assist in world.analysis().assists(FileRange { file_id, range })?.into_iter() {
match &assist.group_label {
Some(label) => grouped_assists.entry(label.to_owned()).or_default().push(assist),
None => res.push(create_single_code_action(assist, &world)?.into()),
Some(label) => grouped_assists
.entry(label.to_owned())
.or_insert_with(|| {
let idx = res.len();
let dummy = Command::new(String::new(), String::new(), None);
res.push(dummy.into());
(idx, Vec::new())
})
.1
.push(assist),
None => {
res.push(create_single_code_action(assist, &world)?.into());
}
}
}
for (group_label, assists) in grouped_assists {
for (group_label, (idx, assists)) in grouped_assists {
if assists.len() == 1 {
res.push(
create_single_code_action(assists.into_iter().next().unwrap(), &world)?.into(),
);
res[idx] =
create_single_code_action(assists.into_iter().next().unwrap(), &world)?.into();
} else {
let title = group_label;
@ -760,17 +770,15 @@ pub fn handle_code_action(
command: "rust-analyzer.selectAndApplySourceChange".to_string(),
arguments: Some(vec![serde_json::Value::Array(arguments)]),
});
res.push(
CodeAction {
title,
kind: None,
diagnostics: None,
edit: None,
command,
is_preferred: None,
}
.into(),
);
res[idx] = CodeAction {
title,
kind: None,
diagnostics: None,
edit: None,
command,
is_preferred: None,
}
.into();
}
}