1 files changed, 11 insertions, 53 deletions

diff --git a/crates/rust-analyzer/src/main_loop/handlers.rs b/crates/rust-analyzer/src/main_loop/handlers.rs
index 121964718..a9703e1d6 100644
--- a/crates/rust-analyzer/src/main_loop/handlers.rs
+++ b/crates/rust-analyzer/src/main_loop/handlers.rs
@@ -18,7 +18,7 @@ use lsp_types::{
     SemanticTokensResult, SymbolInformation, TextDocumentIdentifier, Url, WorkspaceEdit,
 };
 use ra_ide::{
-    Assist, FileId, FilePosition, FileRange, Query, RangeInfo, Runnable, RunnableKind, SearchScope,
+    FileId, FilePosition, FileRange, Query, RangeInfo, Runnable, RunnableKind, SearchScope,
     TextEdit,
 };
 use ra_prof::profile;
@@ -720,6 +720,7 @@ pub fn handle_code_action(
     let file_id = from_proto::file_id(&world, &params.text_document.uri)?;
     let line_index = world.analysis().file_line_index(file_id)?;
     let range = from_proto::text_range(&line_index, params.range);
+    let frange = FileRange { file_id, range };
 
     let diagnostics = world.analysis().diagnostics(file_id)?;
     let mut res: Vec<lsp_ext::CodeAction> = Vec::new();
@@ -730,10 +731,11 @@ pub fn handle_code_action(
         .filter(|(diag_range, _fix)| diag_range.intersect(range).is_some())
         .map(|(_range, fix)| fix);
 
-    for source_edit in fixes_from_diagnostics {
-        let title = source_edit.label.clone();
-        let edit = to_proto::snippet_workspace_edit(&world, source_edit)?;
-        let action = lsp_ext::CodeAction { title, kind: None, edit: Some(edit), command: None };
+    for fix in fixes_from_diagnostics {
+        let title = fix.label;
+        let edit = to_proto::snippet_workspace_edit(&world, fix.source_change)?;
+        let action =
+            lsp_ext::CodeAction { title, group: None, kind: None, edit: Some(edit), command: None };
         res.push(action);
     }
 
@@ -745,53 +747,9 @@ pub fn handle_code_action(
         res.push(fix.action.clone());
     }
 
-    let mut grouped_assists: FxHashMap<String, (usize, Vec<Assist>)> = FxHashMap::default();
-    for assist in
-        world.analysis().assists(&world.config.assist, FileRange { file_id, range })?.into_iter()
-    {
-        match &assist.group_label {
-            Some(label) => grouped_assists
-                .entry(label.to_owned())
-                .or_insert_with(|| {
-                    let idx = res.len();
-                    let dummy = lsp_ext::CodeAction {
-                        title: String::new(),
-                        kind: None,
-                        command: None,
-                        edit: None,
-                    };
-                    res.push(dummy);
-                    (idx, Vec::new())
-                })
-                .1
-                .push(assist),
-            None => {
-                res.push(to_proto::code_action(&world, assist)?.into());
-            }
-        }
-    }
-
-    for (group_label, (idx, assists)) in grouped_assists {
-        if assists.len() == 1 {
-            res[idx] = to_proto::code_action(&world, assists.into_iter().next().unwrap())?.into();
-        } else {
-            let title = group_label;
-
-            let mut arguments = Vec::with_capacity(assists.len());
-            for assist in assists {
-                let source_change = to_proto::source_change(&world, assist.source_change)?;
-                arguments.push(to_value(source_change)?);
-            }
-
-            let command = Some(Command {
-                title: title.clone(),
-                command: "rust-analyzer.selectAndApplySourceChange".to_string(),
-                arguments: Some(vec![serde_json::Value::Array(arguments)]),
-            });
-            res[idx] = lsp_ext::CodeAction { title, kind: None, edit: None, command };
-        }
+    for assist in world.analysis().assists(&world.config.assist, frange)?.into_iter() {
+        res.push(to_proto::code_action(&world, assist)?.into());
     }
-
     Ok(Some(res))
 }
 
@@ -986,11 +944,11 @@ pub fn handle_document_highlight(
 pub fn handle_ssr(
     world: WorldSnapshot,
     params: lsp_ext::SsrParams,
-) -> Result<lsp_ext::SourceChange> {
+) -> Result<lsp_types::WorkspaceEdit> {
     let _p = profile("handle_ssr");
     let source_change =
         world.analysis().structural_search_replace(&params.query, params.parse_only)??;
-    to_proto::source_change(&world, source_change)
+    to_proto::workspace_edit(&world, source_change)
 }
 
 pub fn publish_diagnostics(world: &WorldSnapshot, file_id: FileId) -> Result<DiagnosticTask> {