From fdd4df97ba5ce1f59abf9e945052fc6f3e077c3a Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Wed, 6 May 2020 15:26:40 +0200
Subject: Use SourceChange for assists

---
 crates/ra_ide/src/assists.rs | 42 ------------------------------------------
 crates/ra_ide/src/lib.rs     | 31 ++++++++++++++++++++++++-------
 2 files changed, 24 insertions(+), 49 deletions(-)
 delete mode 100644 crates/ra_ide/src/assists.rs

(limited to 'crates/ra_ide/src')

diff --git a/crates/ra_ide/src/assists.rs b/crates/ra_ide/src/assists.rs
deleted file mode 100644
index 389339a03..000000000
--- a/crates/ra_ide/src/assists.rs
+++ /dev/null
@@ -1,42 +0,0 @@
-//! FIXME: write short doc here
-
-use ra_assists::{resolved_assists, AssistAction};
-use ra_db::{FilePosition, FileRange};
-use ra_ide_db::RootDatabase;
-
-use crate::{FileId, SourceChange, SourceFileEdit};
-
-pub use ra_assists::AssistId;
-
-#[derive(Debug)]
-pub struct Assist {
-    pub id: AssistId,
-    pub label: String,
-    pub group_label: Option<String>,
-    pub source_change: SourceChange,
-}
-
-pub(crate) fn assists(db: &RootDatabase, frange: FileRange) -> Vec<Assist> {
-    resolved_assists(db, frange)
-        .into_iter()
-        .map(|assist| {
-            let file_id = frange.file_id;
-            Assist {
-                id: assist.label.id,
-                label: assist.label.label.clone(),
-                group_label: assist.label.group.map(|it| it.0),
-                source_change: action_to_edit(assist.action, file_id, assist.label.label.clone()),
-            }
-        })
-        .collect()
-}
-
-fn action_to_edit(action: AssistAction, file_id: FileId, label: String) -> SourceChange {
-    let file_id = match action.file {
-        ra_assists::AssistFile::TargetFile(it) => it,
-        _ => file_id,
-    };
-    let file_edit = SourceFileEdit { file_id, edit: action.edit };
-    SourceChange::source_file_edit(label, file_edit)
-        .with_cursor_opt(action.cursor_position.map(|offset| FilePosition { offset, file_id }))
-}
diff --git a/crates/ra_ide/src/lib.rs b/crates/ra_ide/src/lib.rs
index 4ed02f60e..614029de4 100644
--- a/crates/ra_ide/src/lib.rs
+++ b/crates/ra_ide/src/lib.rs
@@ -31,7 +31,6 @@ mod syntax_highlighting;
 mod parent_module;
 mod references;
 mod impls;
-mod assists;
 mod diagnostics;
 mod syntax_tree;
 mod folding_ranges;
@@ -64,7 +63,6 @@ use ra_syntax::{SourceFile, TextRange, TextSize};
 use crate::display::ToNav;
 
 pub use crate::{
-    assists::{Assist, AssistId},
     call_hierarchy::CallItem,
     completion::{
         CompletionConfig, CompletionItem, CompletionItemKind, CompletionScore, InsertTextFormat,
@@ -84,6 +82,7 @@ pub use crate::{
 };
 
 pub use hir::Documentation;
+pub use ra_assists::AssistId;
 pub use ra_db::{
     Canceled, CrateGraph, CrateId, Edition, FileId, FilePosition, FileRange, SourceRootId,
 };
@@ -134,10 +133,12 @@ pub struct AnalysisHost {
     db: RootDatabase,
 }
 
-impl Default for AnalysisHost {
-    fn default() -> AnalysisHost {
-        AnalysisHost::new(None)
-    }
+#[derive(Debug)]
+pub struct Assist {
+    pub id: AssistId,
+    pub label: String,
+    pub group_label: Option<String>,
+    pub source_change: SourceChange,
 }
 
 impl AnalysisHost {
@@ -187,6 +188,12 @@ impl AnalysisHost {
     }
 }
 
+impl Default for AnalysisHost {
+    fn default() -> AnalysisHost {
+        AnalysisHost::new(None)
+    }
+}
+
 /// Analysis is a snapshot of a world state at a moment in time. It is the main
 /// entry point for asking semantic information about the world. When the world
 /// state is advanced using `AnalysisHost::apply_change` method, all existing
@@ -464,7 +471,17 @@ impl Analysis {
     /// Computes assists (aka code actions aka intentions) for the given
     /// position.
     pub fn assists(&self, frange: FileRange) -> Cancelable<Vec<Assist>> {
-        self.with_db(|db| assists::assists(db, frange))
+        self.with_db(|db| {
+            ra_assists::resolved_assists(db, frange)
+                .into_iter()
+                .map(|assist| Assist {
+                    id: assist.label.id,
+                    label: assist.label.label,
+                    group_label: assist.label.group.map(|it| it.0),
+                    source_change: assist.action,
+                })
+                .collect()
+        })
     }
 
     /// Computes the set of diagnostics for the given file.
-- 
cgit v1.2.3