Merge #276

276: Extract and rename AtomEdit and Edit into ra_text_edit r=matklad a=vemoo

As discused in #105



Co-authored-by: Bernardo <berublan@gmail.com>

Author: bors[bot]

Cargo.lock

@@ -14,6 +14,7 @@ rustc-hash = "1.0"
 parking_lot = "0.6.4"
 ra_syntax = { path = "../ra_syntax" }
 ra_editor = { path = "../ra_editor" }
+ra_text_edit = { path = "../ra_text_edit" }
 ra_db = { path = "../ra_db" }
 hir = { path = "../ra_hir", package = "ra_hir" }
 test_utils = { path = "../test_utils" }

crates/ra_analysis/Cargo.toml

@@ -1,10 +1,11 @@
 mod reference_completion;
 
 use ra_editor::find_node_at_offset;
+use ra_text_edit::AtomTextEdit;
 use ra_syntax::{
     algo::visit::{visitor_ctx, VisitorCtx},
     ast,
-    AstNode, AtomEdit,
+    AstNode,
     SyntaxNodeRef,
 };
 use ra_db::SyntaxDatabase;
@@ -33,7 +34,7 @@ pub(crate) fn completions(
     let original_file = db.source_file(position.file_id);
     // Insert a fake ident to get a valid parse tree
     let file = {
-        let edit = AtomEdit::insert(position.offset, "intellijRulezz".to_string());
+        let edit = AtomTextEdit::insert(position.offset, "intellijRulezz".to_string());
         original_file.reparse(&edit)
     };
 

crates/ra_analysis/src/completion.rs

@@ -18,7 +18,8 @@ pub mod mock_analysis;
 
 use std::{fmt, sync::Arc};
 
-use ra_syntax::{AtomEdit, SourceFileNode, TextRange, TextUnit};
+use ra_syntax::{SourceFileNode, TextRange, TextUnit};
+use ra_text_edit::AtomTextEdit;
 use ra_db::FileResolverImp;
 use rayon::prelude::*;
 use relative_path::RelativePathBuf;
@@ -120,7 +121,7 @@ pub struct SourceChange {
 #[derive(Debug)]
 pub struct SourceFileNodeEdit {
     pub file_id: FileId,
-    pub edits: Vec<AtomEdit>,
+    pub edits: Vec<AtomTextEdit>,
 }
 
 #[derive(Debug)]

crates/ra_analysis/src/lib.rs

@@ -12,6 +12,7 @@ join_to_string = "0.1.1"
 rustc-hash = "1.0"
 
 ra_syntax = { path = "../ra_syntax" }
+ra_text_edit = { path = "../ra_text_edit" }
 
 [dev-dependencies]
 test_utils = { path = "../test_utils" }

crates/ra_editor/Cargo.toml

@@ -8,11 +8,11 @@ use ra_syntax::{
     SyntaxNodeRef, TextRange, TextUnit,
 };
 
-use crate::{find_node_at_offset, Edit, EditBuilder};
+use crate::{find_node_at_offset, TextEdit, TextEditBuilder};
 
 #[derive(Debug)]
 pub struct LocalEdit {
-    pub edit: Edit,
+    pub edit: TextEdit,
     pub cursor_position: Option<TextUnit>,
 }
 
@@ -26,7 +26,7 @@ pub fn flip_comma<'a>(
     let prev = non_trivia_sibling(comma, Direction::Prev)?;
     let next = non_trivia_sibling(comma, Direction::Next)?;
     Some(move || {
-        let mut edit = EditBuilder::new();
+        let mut edit = TextEditBuilder::new();
         edit.replace(prev.range(), next.text().to_string());
         edit.replace(next.range(), prev.text().to_string());
         LocalEdit {
@@ -49,7 +49,7 @@ pub fn add_derive<'a>(
             .filter(|(name, _arg)| name == "derive")
             .map(|(_name, arg)| arg)
             .next();
-        let mut edit = EditBuilder::new();
+        let mut edit = TextEditBuilder::new();
         let offset = match derive_attr {
             None => {
                 edit.insert(node_start, "#[derive()]\n".to_string());
@@ -82,7 +82,7 @@ pub fn add_impl<'a>(
 
     Some(move || {
         let type_params = nominal.type_param_list();
-        let mut edit = EditBuilder::new();
+        let mut edit = TextEditBuilder::new();
         let start_offset = nominal.syntax().range().end();
         let mut buf = String::new();
         buf.push_str("\n\nimpl");
@@ -129,7 +129,7 @@ pub fn introduce_variable<'a>(
     }
     return Some(move || {
         let mut buf = String::new();
-        let mut edit = EditBuilder::new();
+        let mut edit = TextEditBuilder::new();
 
         buf.push_str("let var_name = ");
         expr.syntax().text().push_to(&mut buf);

crates/ra_editor/src/code_actions.rs

@@ -1,5 +1,4 @@
 mod code_actions;
-mod edit;
 mod extend_selection;
 mod folding_ranges;
 mod line_index;
@@ -10,14 +9,13 @@ mod typing;
 
 pub use self::{
     code_actions::{add_derive, add_impl, flip_comma, introduce_variable, LocalEdit},
-    edit::{Edit, EditBuilder},
     extend_selection::extend_selection,
     folding_ranges::{folding_ranges, Fold, FoldKind},
     line_index::{LineCol, LineIndex},
     symbols::{file_structure, file_symbols, FileSymbol, StructureNode},
     typing::{join_lines, on_enter, on_eq_typed},
 };
-pub use ra_syntax::AtomEdit;
+use ra_text_edit::{TextEdit, TextEditBuilder};
 use ra_syntax::{
     algo::find_leaf_at_offset,
     ast::{self, AstNode, NameOwner},

crates/ra_editor/src/lib.rs

@@ -3,13 +3,14 @@ use std::mem;
 use ra_syntax::{
     algo::{find_covering_node, find_leaf_at_offset, LeafAtOffset},
     ast,
-    text_utils::{contains_offset_nonstrict, intersect},
+    text_utils::intersect,
     AstNode, SourceFileNode, SyntaxKind,
     SyntaxKind::*,
     SyntaxNodeRef, TextRange, TextUnit,
 };
+use ra_text_edit::text_utils::contains_offset_nonstrict;
 
-use crate::{find_node_at_offset, EditBuilder, LocalEdit};
+use crate::{find_node_at_offset, TextEditBuilder, LocalEdit};
 
 pub fn join_lines(file: &SourceFileNode, range: TextRange) -> LocalEdit {
     let range = if range.is_empty() {
@@ -18,7 +19,7 @@ pub fn join_lines(file: &SourceFileNode, range: TextRange) -> LocalEdit {
         let pos = match text.find('\n') {
             None => {
                 return LocalEdit {
-                    edit: EditBuilder::new().finish(),
+                    edit: TextEditBuilder::new().finish(),
                     cursor_position: None,
                 };
             }
@@ -30,7 +31,7 @@ pub fn join_lines(file: &SourceFileNode, range: TextRange) -> LocalEdit {
     };
 
     let node = find_covering_node(file.syntax(), range);
-    let mut edit = EditBuilder::new();
+    let mut edit = TextEditBuilder::new();
     for node in node.descendants() {
         let text = match node.leaf_text() {
             Some(text) => text,
@@ -72,7 +73,7 @@ pub fn on_enter(file: &SourceFileNode, offset: TextUnit) -> Option<LocalEdit> {
     let indent = node_indent(file, comment.syntax())?;
     let inserted = format!("\n{}{} ", indent, prefix);
     let cursor_position = offset + TextUnit::of_str(&inserted);
-    let mut edit = EditBuilder::new();
+    let mut edit = TextEditBuilder::new();
     edit.insert(offset, inserted);
     Some(LocalEdit {
         edit: edit.finish(),
@@ -122,15 +123,20 @@ pub fn on_eq_typed(file: &SourceFileNode, offset: TextUnit) -> Option<LocalEdit>
         return None;
     }
     let offset = let_stmt.syntax().range().end();
-    let mut edit = EditBuilder::new();
+    let mut edit = TextEditBuilder::new();
     edit.insert(offset, ";".to_string());
     Some(LocalEdit {
         edit: edit.finish(),
         cursor_position: None,
     })
 }
 
-fn remove_newline(edit: &mut EditBuilder, node: SyntaxNodeRef, node_text: &str, offset: TextUnit) {
+fn remove_newline(
+    edit: &mut TextEditBuilder,
+    node: SyntaxNodeRef,
+    node_text: &str,
+    offset: TextUnit,
+) {
     if node.kind() != WHITESPACE || node_text.bytes().filter(|&b| b == b'\n').count() != 1 {
         // The node is either the first or the last in the file
         let suff = &node_text[TextRange::from_to(
@@ -191,7 +197,7 @@ fn is_trailing_comma(left: SyntaxKind, right: SyntaxKind) -> bool {
     }
 }
 
-fn join_single_expr_block(edit: &mut EditBuilder, node: SyntaxNodeRef) -> Option<()> {
+fn join_single_expr_block(edit: &mut TextEditBuilder, node: SyntaxNodeRef) -> Option<()> {
     let block = ast::Block::cast(node.parent()?)?;
     let block_expr = ast::BlockExpr::cast(block.syntax().parent()?)?;
     let expr = single_expr(block)?;
@@ -269,14 +275,14 @@ fn foo() {
     fn test_join_lines_lambda_block() {
         check_join_lines(
             r"
-pub fn reparse(&self, edit: &AtomEdit) -> File {
+pub fn reparse(&self, edit: &AtomTextEdit) -> File {
     <|>self.incremental_reparse(edit).unwrap_or_else(|| {
         self.full_reparse(edit)
     })
 }
 ",
             r"
-pub fn reparse(&self, edit: &AtomEdit) -> File {
+pub fn reparse(&self, edit: &AtomTextEdit) -> File {
     <|>self.incremental_reparse(edit).unwrap_or_else(|| self.full_reparse(edit))
 }
 ",

crates/ra_editor/src/typing.rs

@@ -28,6 +28,7 @@ rustc-hash = "1.0"
 
 ra_syntax = { path = "../ra_syntax" }
 ra_editor = { path = "../ra_editor" }
+ra_text_edit = { path = "../ra_text_edit" }
 ra_analysis = { path = "../ra_analysis" }
 gen_lsp_server = { path = "../gen_lsp_server" }
 

crates/ra_lsp_server/Cargo.toml

@@ -1,9 +1,10 @@
 use languageserver_types::{
-    Location, Position, Range, SymbolKind, TextDocumentEdit, TextDocumentIdentifier,
-    TextDocumentItem, TextDocumentPositionParams, TextEdit, Url, VersionedTextDocumentIdentifier,
+    self, Location, Position, Range, SymbolKind, TextDocumentEdit, TextDocumentIdentifier,
+    TextDocumentItem, TextDocumentPositionParams, Url, VersionedTextDocumentIdentifier,
 };
 use ra_analysis::{FileId, FileSystemEdit, SourceChange, SourceFileNodeEdit, FilePosition};
-use ra_editor::{AtomEdit, Edit, LineCol, LineIndex};
+use ra_editor::{LineCol, LineIndex};
+use ra_text_edit::{AtomTextEdit, TextEdit};
 use ra_syntax::{SyntaxKind, TextRange, TextUnit};
 
 use crate::{req, server_world::ServerWorld, Result};
@@ -91,24 +92,24 @@ impl ConvWith for Range {
     }
 }
 
-impl ConvWith for Edit {
+impl ConvWith for TextEdit {
     type Ctx = LineIndex;
-    type Output = Vec<TextEdit>;
+    type Output = Vec<languageserver_types::TextEdit>;
 
-    fn conv_with(self, line_index: &LineIndex) -> Vec<TextEdit> {
+    fn conv_with(self, line_index: &LineIndex) -> Vec<languageserver_types::TextEdit> {
         self.into_atoms()
             .into_iter()
             .map_conv_with(line_index)
             .collect()
     }
 }
 
-impl ConvWith for AtomEdit {
+impl ConvWith for AtomTextEdit {
     type Ctx = LineIndex;
-    type Output = TextEdit;
+    type Output = languageserver_types::TextEdit;
 
-    fn conv_with(self, line_index: &LineIndex) -> TextEdit {
-        TextEdit {
+    fn conv_with(self, line_index: &LineIndex) -> languageserver_types::TextEdit {
+        languageserver_types::TextEdit {
             range: self.delete.conv_with(line_index),
             new_text: self.insert,
         }
@@ -228,7 +229,7 @@ impl TryConvWith for SourceChange {
 fn translate_offset_with_edit(
     pre_edit_index: &LineIndex,
     offset: TextUnit,
-    edits: &[AtomEdit],
+    edits: &[AtomTextEdit],
 ) -> LineCol {
     let fallback = pre_edit_index.line_col(offset);
     let edit = match edits.first() {