2019-09-30 03:58:53 -05:00
|
|
|
//! FIXME: write short doc here
|
|
|
|
|
2020-03-24 11:03:05 -05:00
|
|
|
use std::{
|
|
|
|
fmt,
|
2020-10-21 07:17:00 -05:00
|
|
|
hash::BuildHasherDefault,
|
2020-03-24 11:03:05 -05:00
|
|
|
ops::{self, RangeInclusive},
|
|
|
|
};
|
2019-07-20 12:04:34 -05:00
|
|
|
|
2020-10-21 07:17:00 -05:00
|
|
|
use indexmap::IndexMap;
|
2019-04-28 08:43:10 -05:00
|
|
|
use itertools::Itertools;
|
2020-04-09 06:56:45 -05:00
|
|
|
use rustc_hash::FxHashMap;
|
2020-08-12 10:03:06 -05:00
|
|
|
use text_edit::TextEditBuilder;
|
2019-04-28 08:43:10 -05:00
|
|
|
|
2019-07-20 12:04:34 -05:00
|
|
|
use crate::{
|
2020-04-20 09:34:01 -05:00
|
|
|
AstNode, Direction, NodeOrToken, SyntaxElement, SyntaxKind, SyntaxNode, SyntaxNodePtr,
|
2020-04-24 16:40:41 -05:00
|
|
|
SyntaxToken, TextRange, TextSize,
|
2019-07-20 12:04:34 -05:00
|
|
|
};
|
2019-01-07 07:15:47 -06:00
|
|
|
|
2019-04-28 08:43:10 -05:00
|
|
|
/// Returns ancestors of the node at the offset, sorted by length. This should
|
|
|
|
/// do the right thing at an edge, e.g. when searching for expressions at `{
|
2021-01-06 14:15:48 -06:00
|
|
|
/// $0foo }` we will get the name reference instead of the whole block, which
|
2019-04-28 08:43:10 -05:00
|
|
|
/// we would get if we just did `find_token_at_offset(...).flat_map(|t|
|
|
|
|
/// t.parent().ancestors())`.
|
|
|
|
pub fn ancestors_at_offset(
|
|
|
|
node: &SyntaxNode,
|
2020-04-24 16:40:41 -05:00
|
|
|
offset: TextSize,
|
2019-07-18 11:23:05 -05:00
|
|
|
) -> impl Iterator<Item = SyntaxNode> {
|
2019-07-21 05:28:58 -05:00
|
|
|
node.token_at_offset(offset)
|
2021-01-30 09:19:21 -06:00
|
|
|
.map(|token| token.ancestors())
|
2019-07-20 04:58:27 -05:00
|
|
|
.kmerge_by(|node1, node2| node1.text_range().len() < node2.text_range().len())
|
2019-04-28 08:43:10 -05:00
|
|
|
}
|
|
|
|
|
2019-01-08 11:47:37 -06:00
|
|
|
/// Finds a node of specific Ast type at offset. Note that this is slightly
|
2019-01-27 07:49:02 -06:00
|
|
|
/// imprecise: if the cursor is strictly between two nodes of the desired type,
|
2019-01-08 11:47:37 -06:00
|
|
|
/// as in
|
|
|
|
///
|
2020-08-22 14:03:02 -05:00
|
|
|
/// ```no_run
|
2019-01-08 11:47:37 -06:00
|
|
|
/// struct Foo {}|struct Bar;
|
|
|
|
/// ```
|
|
|
|
///
|
2019-04-28 08:43:10 -05:00
|
|
|
/// then the shorter node will be silently preferred.
|
2020-04-24 16:40:41 -05:00
|
|
|
pub fn find_node_at_offset<N: AstNode>(syntax: &SyntaxNode, offset: TextSize) -> Option<N> {
|
2019-04-28 08:43:10 -05:00
|
|
|
ancestors_at_offset(syntax, offset).find_map(N::cast)
|
2019-01-08 11:44:31 -06:00
|
|
|
}
|
|
|
|
|
2020-06-29 10:22:47 -05:00
|
|
|
pub fn find_node_at_range<N: AstNode>(syntax: &SyntaxNode, range: TextRange) -> Option<N> {
|
2021-01-15 11:15:33 -06:00
|
|
|
syntax.covering_element(range).ancestors().find_map(N::cast)
|
2020-06-29 10:22:47 -05:00
|
|
|
}
|
|
|
|
|
2020-02-26 10:12:26 -06:00
|
|
|
/// Skip to next non `trivia` token
|
|
|
|
pub fn skip_trivia_token(mut token: SyntaxToken, direction: Direction) -> Option<SyntaxToken> {
|
|
|
|
while token.kind().is_trivia() {
|
|
|
|
token = match direction {
|
|
|
|
Direction::Next => token.next_token()?,
|
|
|
|
Direction::Prev => token.prev_token()?,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Some(token)
|
|
|
|
}
|
|
|
|
|
2019-02-21 10:49:03 -06:00
|
|
|
/// Finds the first sibling in the given direction which is not `trivia`
|
2019-03-30 05:25:53 -05:00
|
|
|
pub fn non_trivia_sibling(element: SyntaxElement, direction: Direction) -> Option<SyntaxElement> {
|
|
|
|
return match element {
|
2019-07-20 12:04:34 -05:00
|
|
|
NodeOrToken::Node(node) => node.siblings_with_tokens(direction).skip(1).find(not_trivia),
|
|
|
|
NodeOrToken::Token(token) => token.siblings_with_tokens(direction).skip(1).find(not_trivia),
|
2019-03-30 05:25:53 -05:00
|
|
|
};
|
|
|
|
|
|
|
|
fn not_trivia(element: &SyntaxElement) -> bool {
|
|
|
|
match element {
|
2019-07-20 12:04:34 -05:00
|
|
|
NodeOrToken::Node(_) => true,
|
|
|
|
NodeOrToken::Token(token) => !token.kind().is_trivia(),
|
2019-03-30 05:25:53 -05:00
|
|
|
}
|
|
|
|
}
|
2019-02-21 10:49:03 -06:00
|
|
|
}
|
|
|
|
|
2020-02-18 11:35:10 -06:00
|
|
|
pub fn least_common_ancestor(u: &SyntaxNode, v: &SyntaxNode) -> Option<SyntaxNode> {
|
2020-04-09 06:56:45 -05:00
|
|
|
if u == v {
|
|
|
|
return Some(u.clone());
|
|
|
|
}
|
|
|
|
|
|
|
|
let u_depth = u.ancestors().count();
|
|
|
|
let v_depth = v.ancestors().count();
|
|
|
|
let keep = u_depth.min(v_depth);
|
|
|
|
|
|
|
|
let u_candidates = u.ancestors().skip(u_depth - keep);
|
2021-01-08 08:41:32 -06:00
|
|
|
let v_candidates = v.ancestors().skip(v_depth - keep);
|
|
|
|
let (res, _) = u_candidates.zip(v_candidates).find(|(x, y)| x == y)?;
|
2020-04-09 06:56:45 -05:00
|
|
|
Some(res)
|
2020-02-18 11:35:10 -06:00
|
|
|
}
|
|
|
|
|
2020-03-19 05:38:26 -05:00
|
|
|
pub fn neighbor<T: AstNode>(me: &T, direction: Direction) -> Option<T> {
|
|
|
|
me.syntax().siblings(direction).skip(1).find_map(T::cast)
|
|
|
|
}
|
|
|
|
|
2020-04-20 09:34:01 -05:00
|
|
|
pub fn has_errors(node: &SyntaxNode) -> bool {
|
|
|
|
node.children().any(|it| it.kind() == SyntaxKind::ERROR)
|
|
|
|
}
|
|
|
|
|
2019-07-21 05:08:32 -05:00
|
|
|
#[derive(Debug, PartialEq, Eq, Clone, Copy)]
|
|
|
|
pub enum InsertPosition<T> {
|
|
|
|
First,
|
|
|
|
Last,
|
|
|
|
Before(T),
|
|
|
|
After(T),
|
|
|
|
}
|
|
|
|
|
2020-10-21 07:17:00 -05:00
|
|
|
type FxIndexMap<K, V> = IndexMap<K, V, BuildHasherDefault<rustc_hash::FxHasher>>;
|
|
|
|
|
2020-11-09 11:42:32 -06:00
|
|
|
#[derive(Debug, Hash, PartialEq, Eq)]
|
|
|
|
enum TreeDiffInsertPos {
|
|
|
|
After(SyntaxElement),
|
|
|
|
AsFirstChild(SyntaxElement),
|
|
|
|
}
|
|
|
|
|
2020-10-22 06:51:08 -05:00
|
|
|
#[derive(Debug)]
|
2019-09-30 01:27:26 -05:00
|
|
|
pub struct TreeDiff {
|
|
|
|
replacements: FxHashMap<SyntaxElement, SyntaxElement>,
|
2020-10-21 07:17:00 -05:00
|
|
|
deletions: Vec<SyntaxElement>,
|
|
|
|
// the vec as well as the indexmap are both here to preserve order
|
2020-11-09 11:42:32 -06:00
|
|
|
insertions: FxIndexMap<TreeDiffInsertPos, Vec<SyntaxElement>>,
|
2019-09-30 01:27:26 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
impl TreeDiff {
|
|
|
|
pub fn into_text_edit(&self, builder: &mut TextEditBuilder) {
|
2020-11-27 10:00:03 -06:00
|
|
|
let _p = profile::span("into_text_edit");
|
|
|
|
|
2020-10-21 07:17:00 -05:00
|
|
|
for (anchor, to) in self.insertions.iter() {
|
2020-11-09 11:42:32 -06:00
|
|
|
let offset = match anchor {
|
|
|
|
TreeDiffInsertPos::After(it) => it.text_range().end(),
|
|
|
|
TreeDiffInsertPos::AsFirstChild(it) => it.text_range().start(),
|
|
|
|
};
|
|
|
|
to.iter().for_each(|to| builder.insert(offset, to.to_string()));
|
2020-10-21 07:17:00 -05:00
|
|
|
}
|
2019-09-30 01:27:26 -05:00
|
|
|
for (from, to) in self.replacements.iter() {
|
|
|
|
builder.replace(from.text_range(), to.to_string())
|
|
|
|
}
|
2020-10-21 07:17:00 -05:00
|
|
|
for text_range in self.deletions.iter().map(SyntaxElement::text_range) {
|
|
|
|
builder.delete(text_range);
|
|
|
|
}
|
2019-09-30 01:27:26 -05:00
|
|
|
}
|
2020-03-21 09:43:48 -05:00
|
|
|
|
|
|
|
pub fn is_empty(&self) -> bool {
|
2020-10-21 07:17:00 -05:00
|
|
|
self.replacements.is_empty() && self.deletions.is_empty() && self.insertions.is_empty()
|
2020-03-21 09:43:48 -05:00
|
|
|
}
|
2019-09-30 01:27:26 -05:00
|
|
|
}
|
|
|
|
|
2020-10-26 09:40:08 -05:00
|
|
|
/// Finds a (potentially minimal) diff, which, applied to `from`, will result in `to`.
|
2019-09-26 07:56:52 -05:00
|
|
|
///
|
2020-10-21 07:17:00 -05:00
|
|
|
/// Specifically, returns a structure that consists of a replacements, insertions and deletions
|
|
|
|
/// such that applying this map on `from` will result in `to`.
|
2019-09-26 07:56:52 -05:00
|
|
|
///
|
2020-10-21 07:17:00 -05:00
|
|
|
/// This function tries to find a fine-grained diff.
|
2019-09-30 01:27:26 -05:00
|
|
|
pub fn diff(from: &SyntaxNode, to: &SyntaxNode) -> TreeDiff {
|
2020-11-27 10:00:03 -06:00
|
|
|
let _p = profile::span("diff");
|
|
|
|
|
2020-10-21 07:17:00 -05:00
|
|
|
let mut diff = TreeDiff {
|
|
|
|
replacements: FxHashMap::default(),
|
|
|
|
insertions: FxIndexMap::default(),
|
|
|
|
deletions: Vec::new(),
|
|
|
|
};
|
|
|
|
let (from, to) = (from.clone().into(), to.clone().into());
|
|
|
|
|
|
|
|
if !syntax_element_eq(&from, &to) {
|
|
|
|
go(&mut diff, from, to);
|
|
|
|
}
|
|
|
|
return diff;
|
|
|
|
|
|
|
|
fn syntax_element_eq(lhs: &SyntaxElement, rhs: &SyntaxElement) -> bool {
|
|
|
|
lhs.kind() == rhs.kind()
|
2020-02-18 06:53:02 -06:00
|
|
|
&& lhs.text_range().len() == rhs.text_range().len()
|
|
|
|
&& match (&lhs, &rhs) {
|
2019-09-26 07:56:52 -05:00
|
|
|
(NodeOrToken::Node(lhs), NodeOrToken::Node(rhs)) => {
|
2021-01-30 09:19:21 -06:00
|
|
|
lhs == rhs || lhs.text() == rhs.text()
|
2019-09-26 07:56:52 -05:00
|
|
|
}
|
|
|
|
(NodeOrToken::Token(lhs), NodeOrToken::Token(rhs)) => lhs.text() == rhs.text(),
|
|
|
|
_ => false,
|
|
|
|
}
|
2020-10-21 07:17:00 -05:00
|
|
|
}
|
|
|
|
|
2020-10-26 09:40:08 -05:00
|
|
|
// FIXME: this is horrible inefficient. I bet there's a cool algorithm to diff trees properly.
|
2020-10-21 07:17:00 -05:00
|
|
|
fn go(diff: &mut TreeDiff, lhs: SyntaxElement, rhs: SyntaxElement) {
|
|
|
|
let (lhs, rhs) = match lhs.as_node().zip(rhs.as_node()) {
|
|
|
|
Some((lhs, rhs)) => (lhs, rhs),
|
|
|
|
_ => {
|
2021-03-08 14:19:44 -06:00
|
|
|
cov_mark::hit!(diff_node_token_replace);
|
2020-10-21 07:17:00 -05:00
|
|
|
diff.replacements.insert(lhs, rhs);
|
2019-09-26 07:56:52 -05:00
|
|
|
return;
|
|
|
|
}
|
2020-10-21 07:17:00 -05:00
|
|
|
};
|
|
|
|
|
2020-10-26 09:40:08 -05:00
|
|
|
let mut look_ahead_scratch = Vec::default();
|
|
|
|
|
2020-10-21 07:17:00 -05:00
|
|
|
let mut rhs_children = rhs.children_with_tokens();
|
|
|
|
let mut lhs_children = lhs.children_with_tokens();
|
|
|
|
let mut last_lhs = None;
|
|
|
|
loop {
|
|
|
|
let lhs_child = lhs_children.next();
|
|
|
|
match (lhs_child.clone(), rhs_children.next()) {
|
|
|
|
(None, None) => break,
|
2020-11-09 11:42:32 -06:00
|
|
|
(None, Some(element)) => {
|
|
|
|
let insert_pos = match last_lhs.clone() {
|
|
|
|
Some(prev) => {
|
2021-03-08 14:19:44 -06:00
|
|
|
cov_mark::hit!(diff_insert);
|
2020-11-09 11:42:32 -06:00
|
|
|
TreeDiffInsertPos::After(prev)
|
|
|
|
}
|
|
|
|
// first iteration, insert into out parent as the first child
|
|
|
|
None => {
|
2021-03-08 14:19:44 -06:00
|
|
|
cov_mark::hit!(diff_insert_as_first_child);
|
2020-11-09 11:42:32 -06:00
|
|
|
TreeDiffInsertPos::AsFirstChild(lhs.clone().into())
|
|
|
|
}
|
|
|
|
};
|
|
|
|
diff.insertions.entry(insert_pos).or_insert_with(Vec::new).push(element);
|
|
|
|
}
|
2020-10-21 07:17:00 -05:00
|
|
|
(Some(element), None) => {
|
2021-03-08 14:19:44 -06:00
|
|
|
cov_mark::hit!(diff_delete);
|
2020-10-21 07:17:00 -05:00
|
|
|
diff.deletions.push(element);
|
|
|
|
}
|
|
|
|
(Some(ref lhs_ele), Some(ref rhs_ele)) if syntax_element_eq(lhs_ele, rhs_ele) => {}
|
2020-10-26 09:40:08 -05:00
|
|
|
(Some(lhs_ele), Some(rhs_ele)) => {
|
|
|
|
// nodes differ, look for lhs_ele in rhs, if its found we can mark everything up
|
|
|
|
// until that element as insertions. This is important to keep the diff minimal
|
|
|
|
// in regards to insertions that have been actually done, this is important for
|
|
|
|
// use insertions as we do not want to replace the entire module node.
|
|
|
|
look_ahead_scratch.push(rhs_ele.clone());
|
|
|
|
let mut rhs_children_clone = rhs_children.clone();
|
|
|
|
let mut insert = false;
|
|
|
|
while let Some(rhs_child) = rhs_children_clone.next() {
|
|
|
|
if syntax_element_eq(&lhs_ele, &rhs_child) {
|
2021-03-08 14:19:44 -06:00
|
|
|
cov_mark::hit!(diff_insertions);
|
2020-10-26 09:40:08 -05:00
|
|
|
insert = true;
|
|
|
|
break;
|
|
|
|
} else {
|
|
|
|
look_ahead_scratch.push(rhs_child);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
let drain = look_ahead_scratch.drain(..);
|
2020-11-09 11:42:32 -06:00
|
|
|
if insert {
|
|
|
|
let insert_pos = if let Some(prev) = last_lhs.clone().filter(|_| insert) {
|
|
|
|
TreeDiffInsertPos::After(prev)
|
|
|
|
} else {
|
2021-03-08 14:19:44 -06:00
|
|
|
cov_mark::hit!(insert_first_child);
|
2020-11-09 11:42:32 -06:00
|
|
|
TreeDiffInsertPos::AsFirstChild(lhs.clone().into())
|
|
|
|
};
|
|
|
|
|
|
|
|
diff.insertions.entry(insert_pos).or_insert_with(Vec::new).extend(drain);
|
2020-10-26 09:40:08 -05:00
|
|
|
rhs_children = rhs_children_clone;
|
|
|
|
} else {
|
|
|
|
go(diff, lhs_ele, rhs_ele)
|
|
|
|
}
|
|
|
|
}
|
2020-10-21 07:17:00 -05:00
|
|
|
}
|
|
|
|
last_lhs = lhs_child.or(last_lhs);
|
2019-09-26 07:56:52 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-07-20 12:04:34 -05:00
|
|
|
/// Adds specified children (tokens or nodes) to the current node at the
|
|
|
|
/// specific position.
|
|
|
|
///
|
|
|
|
/// This is a type-unsafe low-level editing API, if you need to use it,
|
|
|
|
/// prefer to create a type-safe abstraction on top of it instead.
|
|
|
|
pub fn insert_children(
|
2020-02-29 06:49:43 -06:00
|
|
|
parent: &SyntaxNode,
|
|
|
|
position: InsertPosition<SyntaxElement>,
|
|
|
|
to_insert: impl IntoIterator<Item = SyntaxElement>,
|
|
|
|
) -> SyntaxNode {
|
|
|
|
let mut to_insert = to_insert.into_iter();
|
|
|
|
_insert_children(parent, position, &mut to_insert)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn _insert_children(
|
2019-07-20 12:04:34 -05:00
|
|
|
parent: &SyntaxNode,
|
|
|
|
position: InsertPosition<SyntaxElement>,
|
2019-09-25 09:19:16 -05:00
|
|
|
to_insert: &mut dyn Iterator<Item = SyntaxElement>,
|
2019-07-20 12:04:34 -05:00
|
|
|
) -> SyntaxNode {
|
2020-04-24 16:40:41 -05:00
|
|
|
let mut delta = TextSize::default();
|
2019-07-20 12:04:34 -05:00
|
|
|
let to_insert = to_insert.map(|element| {
|
|
|
|
delta += element.text_range().len();
|
|
|
|
to_green_element(element)
|
|
|
|
});
|
|
|
|
|
2021-01-30 09:19:21 -06:00
|
|
|
let parent_green = parent.green();
|
|
|
|
let mut old_children = parent_green.children().map(|it| match it {
|
|
|
|
NodeOrToken::Token(it) => NodeOrToken::Token(it.to_owned()),
|
|
|
|
NodeOrToken::Node(it) => NodeOrToken::Node(it.to_owned()),
|
2019-11-19 12:13:36 -06:00
|
|
|
});
|
2019-07-20 12:04:34 -05:00
|
|
|
|
|
|
|
let new_children = match &position {
|
2019-12-04 10:15:55 -06:00
|
|
|
InsertPosition::First => to_insert.chain(old_children).collect::<Vec<_>>(),
|
|
|
|
InsertPosition::Last => old_children.chain(to_insert).collect::<Vec<_>>(),
|
2019-07-20 12:04:34 -05:00
|
|
|
InsertPosition::Before(anchor) | InsertPosition::After(anchor) => {
|
|
|
|
let take_anchor = if let InsertPosition::After(_) = position { 1 } else { 0 };
|
|
|
|
let split_at = position_of_child(parent, anchor.clone()) + take_anchor;
|
2019-11-19 12:13:36 -06:00
|
|
|
let before = old_children.by_ref().take(split_at).collect::<Vec<_>>();
|
2019-12-04 10:15:55 -06:00
|
|
|
before.into_iter().chain(to_insert).chain(old_children).collect::<Vec<_>>()
|
2019-07-20 12:04:34 -05:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
with_children(parent, new_children)
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Replaces all nodes in `to_delete` with nodes from `to_insert`
|
|
|
|
///
|
|
|
|
/// This is a type-unsafe low-level editing API, if you need to use it,
|
|
|
|
/// prefer to create a type-safe abstraction on top of it instead.
|
|
|
|
pub fn replace_children(
|
2020-02-29 06:49:43 -06:00
|
|
|
parent: &SyntaxNode,
|
|
|
|
to_delete: RangeInclusive<SyntaxElement>,
|
|
|
|
to_insert: impl IntoIterator<Item = SyntaxElement>,
|
|
|
|
) -> SyntaxNode {
|
|
|
|
let mut to_insert = to_insert.into_iter();
|
|
|
|
_replace_children(parent, to_delete, &mut to_insert)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn _replace_children(
|
2019-07-20 12:04:34 -05:00
|
|
|
parent: &SyntaxNode,
|
|
|
|
to_delete: RangeInclusive<SyntaxElement>,
|
2019-09-25 09:19:16 -05:00
|
|
|
to_insert: &mut dyn Iterator<Item = SyntaxElement>,
|
2019-07-20 12:04:34 -05:00
|
|
|
) -> SyntaxNode {
|
|
|
|
let start = position_of_child(parent, to_delete.start().clone());
|
|
|
|
let end = position_of_child(parent, to_delete.end().clone());
|
2021-01-30 09:19:21 -06:00
|
|
|
let parent_green = parent.green();
|
|
|
|
let mut old_children = parent_green.children().map(|it| match it {
|
|
|
|
NodeOrToken::Token(it) => NodeOrToken::Token(it.to_owned()),
|
|
|
|
NodeOrToken::Node(it) => NodeOrToken::Node(it.to_owned()),
|
2019-11-19 12:13:36 -06:00
|
|
|
});
|
2019-07-20 12:04:34 -05:00
|
|
|
|
2019-11-19 12:13:36 -06:00
|
|
|
let before = old_children.by_ref().take(start).collect::<Vec<_>>();
|
|
|
|
let new_children = before
|
|
|
|
.into_iter()
|
2019-07-20 12:04:34 -05:00
|
|
|
.chain(to_insert.map(to_green_element))
|
2019-11-19 12:13:36 -06:00
|
|
|
.chain(old_children.skip(end + 1 - start))
|
2019-12-04 10:15:55 -06:00
|
|
|
.collect::<Vec<_>>();
|
2019-07-20 12:04:34 -05:00
|
|
|
with_children(parent, new_children)
|
|
|
|
}
|
|
|
|
|
2020-10-24 13:53:16 -05:00
|
|
|
#[derive(Debug, PartialEq, Eq, Hash)]
|
|
|
|
enum InsertPos {
|
|
|
|
FirstChildOf(SyntaxNode),
|
|
|
|
After(SyntaxElement),
|
|
|
|
}
|
|
|
|
|
2020-03-24 11:03:05 -05:00
|
|
|
#[derive(Default)]
|
|
|
|
pub struct SyntaxRewriter<'a> {
|
|
|
|
//FIXME: add debug_assertions that all elements are in fact from the same file.
|
|
|
|
replacements: FxHashMap<SyntaxElement, Replacement>,
|
2020-10-24 13:53:16 -05:00
|
|
|
insertions: IndexMap<InsertPos, Vec<SyntaxElement>>,
|
2021-04-23 11:36:43 -05:00
|
|
|
_pd: std::marker::PhantomData<&'a ()>,
|
2020-02-29 06:49:43 -06:00
|
|
|
}
|
|
|
|
|
2020-03-24 11:03:05 -05:00
|
|
|
impl fmt::Debug for SyntaxRewriter<'_> {
|
|
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
2020-11-09 07:09:49 -06:00
|
|
|
f.debug_struct("SyntaxRewriter")
|
|
|
|
.field("replacements", &self.replacements)
|
|
|
|
.field("insertions", &self.insertions)
|
|
|
|
.finish()
|
2020-03-24 11:03:05 -05:00
|
|
|
}
|
|
|
|
}
|
2019-09-25 09:57:12 -05:00
|
|
|
|
2021-04-23 11:36:43 -05:00
|
|
|
impl SyntaxRewriter<'_> {
|
2020-03-24 11:03:05 -05:00
|
|
|
pub fn delete<T: Clone + Into<SyntaxElement>>(&mut self, what: &T) {
|
|
|
|
let what = what.clone().into();
|
|
|
|
let replacement = Replacement::Delete;
|
|
|
|
self.replacements.insert(what, replacement);
|
|
|
|
}
|
2020-10-24 13:53:16 -05:00
|
|
|
pub fn insert_before<T: Clone + Into<SyntaxElement>, U: Clone + Into<SyntaxElement>>(
|
|
|
|
&mut self,
|
|
|
|
before: &T,
|
|
|
|
what: &U,
|
|
|
|
) {
|
2020-10-24 14:57:58 -05:00
|
|
|
let before = before.clone().into();
|
|
|
|
let pos = match before.prev_sibling_or_token() {
|
|
|
|
Some(sibling) => InsertPos::After(sibling),
|
|
|
|
None => match before.parent() {
|
|
|
|
Some(parent) => InsertPos::FirstChildOf(parent),
|
|
|
|
None => return,
|
|
|
|
},
|
|
|
|
};
|
|
|
|
self.insertions.entry(pos).or_insert_with(Vec::new).push(what.clone().into());
|
2020-10-24 13:53:16 -05:00
|
|
|
}
|
|
|
|
pub fn insert_after<T: Clone + Into<SyntaxElement>, U: Clone + Into<SyntaxElement>>(
|
|
|
|
&mut self,
|
|
|
|
after: &T,
|
|
|
|
what: &U,
|
|
|
|
) {
|
|
|
|
self.insertions
|
|
|
|
.entry(InsertPos::After(after.clone().into()))
|
|
|
|
.or_insert_with(Vec::new)
|
|
|
|
.push(what.clone().into());
|
|
|
|
}
|
|
|
|
pub fn insert_as_first_child<T: Clone + Into<SyntaxNode>, U: Clone + Into<SyntaxElement>>(
|
|
|
|
&mut self,
|
|
|
|
parent: &T,
|
|
|
|
what: &U,
|
|
|
|
) {
|
|
|
|
self.insertions
|
|
|
|
.entry(InsertPos::FirstChildOf(parent.clone().into()))
|
|
|
|
.or_insert_with(Vec::new)
|
|
|
|
.push(what.clone().into());
|
|
|
|
}
|
|
|
|
pub fn insert_many_before<
|
|
|
|
T: Clone + Into<SyntaxElement>,
|
|
|
|
U: IntoIterator<Item = SyntaxElement>,
|
|
|
|
>(
|
|
|
|
&mut self,
|
|
|
|
before: &T,
|
|
|
|
what: U,
|
|
|
|
) {
|
2020-10-24 14:57:58 -05:00
|
|
|
let before = before.clone().into();
|
|
|
|
let pos = match before.prev_sibling_or_token() {
|
|
|
|
Some(sibling) => InsertPos::After(sibling),
|
|
|
|
None => match before.parent() {
|
|
|
|
Some(parent) => InsertPos::FirstChildOf(parent),
|
|
|
|
None => return,
|
|
|
|
},
|
|
|
|
};
|
|
|
|
self.insertions.entry(pos).or_insert_with(Vec::new).extend(what);
|
2020-10-24 13:53:16 -05:00
|
|
|
}
|
|
|
|
pub fn insert_many_after<
|
|
|
|
T: Clone + Into<SyntaxElement>,
|
|
|
|
U: IntoIterator<Item = SyntaxElement>,
|
|
|
|
>(
|
|
|
|
&mut self,
|
|
|
|
after: &T,
|
|
|
|
what: U,
|
|
|
|
) {
|
|
|
|
self.insertions
|
|
|
|
.entry(InsertPos::After(after.clone().into()))
|
|
|
|
.or_insert_with(Vec::new)
|
|
|
|
.extend(what);
|
|
|
|
}
|
|
|
|
pub fn insert_many_as_first_children<
|
|
|
|
T: Clone + Into<SyntaxNode>,
|
|
|
|
U: IntoIterator<Item = SyntaxElement>,
|
|
|
|
>(
|
|
|
|
&mut self,
|
|
|
|
parent: &T,
|
|
|
|
what: U,
|
|
|
|
) {
|
|
|
|
self.insertions
|
|
|
|
.entry(InsertPos::FirstChildOf(parent.clone().into()))
|
|
|
|
.or_insert_with(Vec::new)
|
|
|
|
.extend(what)
|
|
|
|
}
|
2020-03-24 11:03:05 -05:00
|
|
|
pub fn replace<T: Clone + Into<SyntaxElement>>(&mut self, what: &T, with: &T) {
|
|
|
|
let what = what.clone().into();
|
|
|
|
let replacement = Replacement::Single(with.clone().into());
|
|
|
|
self.replacements.insert(what, replacement);
|
|
|
|
}
|
2020-05-19 16:12:01 -05:00
|
|
|
pub fn replace_with_many<T: Clone + Into<SyntaxElement>>(
|
|
|
|
&mut self,
|
|
|
|
what: &T,
|
|
|
|
with: Vec<SyntaxElement>,
|
|
|
|
) {
|
|
|
|
let what = what.clone().into();
|
|
|
|
let replacement = Replacement::Many(with);
|
|
|
|
self.replacements.insert(what, replacement);
|
|
|
|
}
|
2020-03-24 11:03:05 -05:00
|
|
|
pub fn replace_ast<T: AstNode>(&mut self, what: &T, with: &T) {
|
|
|
|
self.replace(what.syntax(), with.syntax())
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn rewrite(&self, node: &SyntaxNode) -> SyntaxNode {
|
2020-11-27 10:00:03 -06:00
|
|
|
let _p = profile::span("rewrite");
|
|
|
|
|
2021-04-23 11:36:43 -05:00
|
|
|
if self.replacements.is_empty() && self.insertions.is_empty() {
|
2020-03-24 11:03:05 -05:00
|
|
|
return node.clone();
|
|
|
|
}
|
2020-12-10 11:07:37 -06:00
|
|
|
let green = self.rewrite_children(node);
|
|
|
|
with_green(node, green)
|
2020-03-24 11:03:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
pub fn rewrite_ast<N: AstNode>(self, node: &N) -> N {
|
|
|
|
N::cast(self.rewrite(node.syntax())).unwrap()
|
|
|
|
}
|
|
|
|
|
2020-06-13 11:55:10 -05:00
|
|
|
/// Returns a node that encompasses all replacements to be done by this rewriter.
|
|
|
|
///
|
|
|
|
/// Passing the returned node to `rewrite` will apply all replacements queued up in `self`.
|
|
|
|
///
|
|
|
|
/// Returns `None` when there are no replacements.
|
2020-03-24 11:03:05 -05:00
|
|
|
pub fn rewrite_root(&self) -> Option<SyntaxNode> {
|
2020-11-27 10:00:03 -06:00
|
|
|
let _p = profile::span("rewrite_root");
|
2021-01-30 09:19:21 -06:00
|
|
|
fn element_to_node_or_parent(element: &SyntaxElement) -> Option<SyntaxNode> {
|
2020-10-24 13:53:16 -05:00
|
|
|
match element {
|
2021-01-30 09:19:21 -06:00
|
|
|
SyntaxElement::Node(it) => Some(it.clone()),
|
2020-10-24 13:53:16 -05:00
|
|
|
SyntaxElement::Token(it) => it.parent(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-03-24 11:03:05 -05:00
|
|
|
self.replacements
|
|
|
|
.keys()
|
2021-01-30 09:19:21 -06:00
|
|
|
.filter_map(element_to_node_or_parent)
|
|
|
|
.chain(self.insertions.keys().filter_map(|pos| match pos {
|
|
|
|
InsertPos::FirstChildOf(it) => Some(it.clone()),
|
2020-10-24 14:57:58 -05:00
|
|
|
InsertPos::After(it) => element_to_node_or_parent(it),
|
2020-10-24 13:53:16 -05:00
|
|
|
}))
|
|
|
|
// If we only have one replacement/insertion, we must return its parent node, since `rewrite` does
|
2020-06-13 11:55:10 -05:00
|
|
|
// not replace the node passed to it.
|
|
|
|
.map(|it| it.parent().unwrap_or(it))
|
2020-03-24 11:03:05 -05:00
|
|
|
.fold1(|a, b| least_common_ancestor(&a, &b).unwrap())
|
|
|
|
}
|
|
|
|
|
|
|
|
fn replacement(&self, element: &SyntaxElement) -> Option<Replacement> {
|
|
|
|
self.replacements.get(element).cloned()
|
|
|
|
}
|
|
|
|
|
2020-10-24 13:53:16 -05:00
|
|
|
fn insertions(&self, pos: &InsertPos) -> Option<impl Iterator<Item = SyntaxElement> + '_> {
|
|
|
|
self.insertions.get(pos).map(|insertions| insertions.iter().cloned())
|
|
|
|
}
|
|
|
|
|
2020-12-10 11:07:37 -06:00
|
|
|
fn rewrite_children(&self, node: &SyntaxNode) -> rowan::GreenNode {
|
2020-11-27 10:00:03 -06:00
|
|
|
let _p = profile::span("rewrite_children");
|
|
|
|
|
2020-03-24 11:03:05 -05:00
|
|
|
// FIXME: this could be made much faster.
|
2020-05-19 16:12:01 -05:00
|
|
|
let mut new_children = Vec::new();
|
2020-10-24 13:53:16 -05:00
|
|
|
if let Some(elements) = self.insertions(&InsertPos::FirstChildOf(node.clone())) {
|
|
|
|
new_children.extend(elements.map(element_to_green));
|
|
|
|
}
|
2020-05-19 16:12:01 -05:00
|
|
|
for child in node.children_with_tokens() {
|
|
|
|
self.rewrite_self(&mut new_children, &child);
|
|
|
|
}
|
2020-12-10 11:07:37 -06:00
|
|
|
|
|
|
|
rowan::GreenNode::new(rowan::SyntaxKind(node.kind() as u16), new_children)
|
2020-03-24 11:03:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
fn rewrite_self(
|
|
|
|
&self,
|
2020-05-19 16:12:01 -05:00
|
|
|
acc: &mut Vec<NodeOrToken<rowan::GreenNode, rowan::GreenToken>>,
|
2020-03-24 11:03:05 -05:00
|
|
|
element: &SyntaxElement,
|
2020-05-19 16:12:01 -05:00
|
|
|
) {
|
2020-11-27 10:00:03 -06:00
|
|
|
let _p = profile::span("rewrite_self");
|
|
|
|
|
2020-03-24 11:03:05 -05:00
|
|
|
if let Some(replacement) = self.replacement(&element) {
|
2020-05-19 16:12:01 -05:00
|
|
|
match replacement {
|
2020-10-24 13:53:16 -05:00
|
|
|
Replacement::Single(element) => acc.push(element_to_green(element)),
|
2020-05-19 16:12:01 -05:00
|
|
|
Replacement::Many(replacements) => {
|
2020-10-24 13:53:16 -05:00
|
|
|
acc.extend(replacements.into_iter().map(element_to_green))
|
2020-05-19 16:12:01 -05:00
|
|
|
}
|
|
|
|
Replacement::Delete => (),
|
2019-09-25 09:57:12 -05:00
|
|
|
};
|
2020-10-24 13:53:16 -05:00
|
|
|
} else {
|
|
|
|
match element {
|
2021-01-30 09:19:21 -06:00
|
|
|
NodeOrToken::Token(it) => acc.push(NodeOrToken::Token(it.green().to_owned())),
|
2020-10-24 13:53:16 -05:00
|
|
|
NodeOrToken::Node(it) => {
|
2020-12-10 11:07:37 -06:00
|
|
|
acc.push(NodeOrToken::Node(self.rewrite_children(it)));
|
2020-10-24 13:53:16 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if let Some(elements) = self.insertions(&InsertPos::After(element.clone())) {
|
|
|
|
acc.extend(elements.map(element_to_green));
|
2019-09-25 09:57:12 -05:00
|
|
|
}
|
2020-10-24 13:53:16 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn element_to_green(element: SyntaxElement) -> NodeOrToken<rowan::GreenNode, rowan::GreenToken> {
|
|
|
|
match element {
|
2021-03-21 06:05:08 -05:00
|
|
|
NodeOrToken::Node(it) => NodeOrToken::Node(it.green()),
|
2021-01-30 09:19:21 -06:00
|
|
|
NodeOrToken::Token(it) => NodeOrToken::Token(it.green().to_owned()),
|
2020-03-24 11:03:05 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-04-03 14:12:07 -05:00
|
|
|
impl ops::AddAssign for SyntaxRewriter<'_> {
|
2020-03-24 11:03:05 -05:00
|
|
|
fn add_assign(&mut self, rhs: SyntaxRewriter) {
|
2020-10-24 13:53:16 -05:00
|
|
|
self.replacements.extend(rhs.replacements);
|
|
|
|
for (pos, insertions) in rhs.insertions.into_iter() {
|
|
|
|
match self.insertions.entry(pos) {
|
|
|
|
indexmap::map::Entry::Occupied(mut occupied) => {
|
|
|
|
occupied.get_mut().extend(insertions)
|
|
|
|
}
|
|
|
|
indexmap::map::Entry::Vacant(vacant) => drop(vacant.insert(insertions)),
|
|
|
|
}
|
|
|
|
}
|
2019-09-25 09:57:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-03-24 11:03:05 -05:00
|
|
|
#[derive(Clone, Debug)]
|
|
|
|
enum Replacement {
|
|
|
|
Delete,
|
|
|
|
Single(SyntaxElement),
|
2020-05-19 16:12:01 -05:00
|
|
|
Many(Vec<SyntaxElement>),
|
2020-03-24 11:03:05 -05:00
|
|
|
}
|
|
|
|
|
2019-07-20 12:04:34 -05:00
|
|
|
fn with_children(
|
|
|
|
parent: &SyntaxNode,
|
2019-12-04 10:15:55 -06:00
|
|
|
new_children: Vec<NodeOrToken<rowan::GreenNode, rowan::GreenToken>>,
|
2019-07-20 12:04:34 -05:00
|
|
|
) -> SyntaxNode {
|
2020-11-27 10:00:03 -06:00
|
|
|
let _p = profile::span("with_children");
|
|
|
|
|
2020-12-10 11:07:37 -06:00
|
|
|
let new_green = rowan::GreenNode::new(rowan::SyntaxKind(parent.kind() as u16), new_children);
|
|
|
|
with_green(parent, new_green)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn with_green(syntax_node: &SyntaxNode, green: rowan::GreenNode) -> SyntaxNode {
|
|
|
|
let len = green.children().map(|it| it.text_len()).sum::<TextSize>();
|
|
|
|
let new_root_node = syntax_node.replace_with(green);
|
2019-07-21 05:28:58 -05:00
|
|
|
let new_root_node = SyntaxNode::new_root(new_root_node);
|
2019-07-20 12:04:34 -05:00
|
|
|
|
|
|
|
// FIXME: use a more elegant way to re-fetch the node (#1185), make
|
|
|
|
// `range` private afterwards
|
2020-12-10 11:07:37 -06:00
|
|
|
let mut ptr = SyntaxNodePtr::new(syntax_node);
|
2020-04-24 16:40:41 -05:00
|
|
|
ptr.range = TextRange::at(ptr.range.start(), len);
|
2019-07-21 05:28:58 -05:00
|
|
|
ptr.to_node(&new_root_node)
|
2019-07-20 12:04:34 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
fn position_of_child(parent: &SyntaxNode, child: SyntaxElement) -> usize {
|
|
|
|
parent
|
|
|
|
.children_with_tokens()
|
|
|
|
.position(|it| it == child)
|
|
|
|
.expect("element is not a child of current element")
|
|
|
|
}
|
|
|
|
|
|
|
|
fn to_green_element(element: SyntaxElement) -> NodeOrToken<rowan::GreenNode, rowan::GreenToken> {
|
|
|
|
match element {
|
2021-03-21 06:05:08 -05:00
|
|
|
NodeOrToken::Node(it) => it.green().into(),
|
2021-01-30 09:19:21 -06:00
|
|
|
NodeOrToken::Token(it) => it.green().to_owned().into(),
|
2019-07-20 12:04:34 -05:00
|
|
|
}
|
2018-08-07 10:28:30 -05:00
|
|
|
}
|
2020-10-22 06:51:08 -05:00
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
|
|
|
use expect_test::{expect, Expect};
|
|
|
|
use itertools::Itertools;
|
|
|
|
use parser::SyntaxKind;
|
|
|
|
use text_edit::TextEdit;
|
|
|
|
|
|
|
|
use crate::{AstNode, SyntaxElement};
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn replace_node_token() {
|
2021-03-08 14:19:44 -06:00
|
|
|
cov_mark::check!(diff_node_token_replace);
|
2020-10-22 06:51:08 -05:00
|
|
|
check_diff(
|
|
|
|
r#"use node;"#,
|
|
|
|
r#"ident"#,
|
|
|
|
expect![[r#"
|
|
|
|
insertions:
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
replacements:
|
|
|
|
|
|
|
|
Line 0: Token(USE_KW@0..3 "use") -> ident
|
|
|
|
|
|
|
|
deletions:
|
|
|
|
|
|
|
|
Line 1: " "
|
|
|
|
Line 1: node
|
|
|
|
Line 1: ;
|
|
|
|
"#]],
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
2020-10-26 09:40:08 -05:00
|
|
|
fn replace_parent() {
|
2021-03-08 14:19:44 -06:00
|
|
|
cov_mark::check!(diff_insert_as_first_child);
|
2020-10-26 09:40:08 -05:00
|
|
|
check_diff(
|
|
|
|
r#""#,
|
|
|
|
r#"use foo::bar;"#,
|
|
|
|
expect![[r#"
|
|
|
|
insertions:
|
|
|
|
|
2020-11-09 11:42:32 -06:00
|
|
|
Line 0: AsFirstChild(Node(SOURCE_FILE@0..0))
|
|
|
|
-> use foo::bar;
|
2020-10-26 09:40:08 -05:00
|
|
|
|
|
|
|
replacements:
|
|
|
|
|
2020-11-09 11:42:32 -06:00
|
|
|
|
2020-10-26 09:40:08 -05:00
|
|
|
|
|
|
|
deletions:
|
|
|
|
|
|
|
|
|
|
|
|
"#]],
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn insert_last() {
|
2021-03-08 14:19:44 -06:00
|
|
|
cov_mark::check!(diff_insert);
|
2020-10-22 06:51:08 -05:00
|
|
|
check_diff(
|
2020-10-26 09:40:08 -05:00
|
|
|
r#"
|
|
|
|
use foo;
|
2020-10-22 06:51:08 -05:00
|
|
|
use bar;"#,
|
2020-10-26 09:40:08 -05:00
|
|
|
r#"
|
|
|
|
use foo;
|
|
|
|
use bar;
|
|
|
|
use baz;"#,
|
2020-10-22 06:51:08 -05:00
|
|
|
expect![[r#"
|
|
|
|
insertions:
|
|
|
|
|
2020-11-09 11:42:32 -06:00
|
|
|
Line 2: After(Node(USE@10..18))
|
2020-10-22 06:51:08 -05:00
|
|
|
-> "\n"
|
2020-10-26 09:40:08 -05:00
|
|
|
-> use baz;
|
2020-10-22 06:51:08 -05:00
|
|
|
|
|
|
|
replacements:
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
deletions:
|
|
|
|
|
|
|
|
|
|
|
|
"#]],
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
2020-10-26 09:40:08 -05:00
|
|
|
fn insert_middle() {
|
2020-10-22 06:51:08 -05:00
|
|
|
check_diff(
|
2020-10-26 09:40:08 -05:00
|
|
|
r#"
|
|
|
|
use foo;
|
|
|
|
use baz;"#,
|
|
|
|
r#"
|
|
|
|
use foo;
|
|
|
|
use bar;
|
|
|
|
use baz;"#,
|
2020-10-22 06:51:08 -05:00
|
|
|
expect![[r#"
|
|
|
|
insertions:
|
|
|
|
|
2020-11-09 11:42:32 -06:00
|
|
|
Line 2: After(Token(WHITESPACE@9..10 "\n"))
|
2020-10-26 09:40:08 -05:00
|
|
|
-> use bar;
|
|
|
|
-> "\n"
|
|
|
|
|
|
|
|
replacements:
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
deletions:
|
|
|
|
|
|
|
|
|
|
|
|
"#]],
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn insert_first() {
|
|
|
|
check_diff(
|
|
|
|
r#"
|
|
|
|
use bar;
|
|
|
|
use baz;"#,
|
|
|
|
r#"
|
|
|
|
use foo;
|
|
|
|
use bar;
|
|
|
|
use baz;"#,
|
|
|
|
expect![[r#"
|
|
|
|
insertions:
|
2020-10-22 06:51:08 -05:00
|
|
|
|
2020-11-09 11:42:32 -06:00
|
|
|
Line 0: After(Token(WHITESPACE@0..1 "\n"))
|
2020-10-26 09:40:08 -05:00
|
|
|
-> use foo;
|
|
|
|
-> "\n"
|
2020-10-22 06:51:08 -05:00
|
|
|
|
|
|
|
replacements:
|
|
|
|
|
2020-10-26 09:40:08 -05:00
|
|
|
|
2020-10-22 06:51:08 -05:00
|
|
|
|
|
|
|
deletions:
|
|
|
|
|
|
|
|
|
|
|
|
"#]],
|
2020-10-26 09:40:08 -05:00
|
|
|
)
|
2020-10-22 06:51:08 -05:00
|
|
|
}
|
|
|
|
|
2020-11-09 11:42:32 -06:00
|
|
|
#[test]
|
|
|
|
fn first_child_insertion() {
|
2021-03-08 14:19:44 -06:00
|
|
|
cov_mark::check!(insert_first_child);
|
2020-11-09 11:42:32 -06:00
|
|
|
check_diff(
|
|
|
|
r#"fn main() {
|
|
|
|
stdi
|
|
|
|
}"#,
|
|
|
|
r#"use foo::bar;
|
|
|
|
|
|
|
|
fn main() {
|
|
|
|
stdi
|
|
|
|
}"#,
|
|
|
|
expect![[r#"
|
|
|
|
insertions:
|
|
|
|
|
|
|
|
Line 0: AsFirstChild(Node(SOURCE_FILE@0..30))
|
|
|
|
-> use foo::bar;
|
|
|
|
-> "\n\n "
|
|
|
|
|
|
|
|
replacements:
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
deletions:
|
|
|
|
|
|
|
|
|
|
|
|
"#]],
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2020-10-22 06:51:08 -05:00
|
|
|
#[test]
|
2020-10-26 09:40:08 -05:00
|
|
|
fn delete_last() {
|
2021-03-08 14:19:44 -06:00
|
|
|
cov_mark::check!(diff_delete);
|
2020-10-22 06:51:08 -05:00
|
|
|
check_diff(
|
|
|
|
r#"use foo;
|
|
|
|
use bar;"#,
|
|
|
|
r#"use foo;"#,
|
|
|
|
expect![[r#"
|
|
|
|
insertions:
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
replacements:
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
deletions:
|
|
|
|
|
|
|
|
Line 1: "\n "
|
|
|
|
Line 2: use bar;
|
|
|
|
"#]],
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
2020-10-26 09:40:08 -05:00
|
|
|
fn delete_middle() {
|
2021-03-08 14:19:44 -06:00
|
|
|
cov_mark::check!(diff_insertions);
|
2020-10-22 06:51:08 -05:00
|
|
|
check_diff(
|
|
|
|
r#"
|
|
|
|
use expect_test::{expect, Expect};
|
2020-10-26 09:40:08 -05:00
|
|
|
use text_edit::TextEdit;
|
2020-10-22 06:51:08 -05:00
|
|
|
|
|
|
|
use crate::AstNode;
|
|
|
|
"#,
|
|
|
|
r#"
|
|
|
|
use expect_test::{expect, Expect};
|
|
|
|
|
|
|
|
use crate::AstNode;
|
|
|
|
"#,
|
|
|
|
expect![[r#"
|
|
|
|
insertions:
|
|
|
|
|
2020-11-09 11:42:32 -06:00
|
|
|
Line 1: After(Node(USE@1..35))
|
2020-10-26 09:40:08 -05:00
|
|
|
-> "\n\n"
|
2020-10-22 06:51:08 -05:00
|
|
|
-> use crate::AstNode;
|
|
|
|
|
|
|
|
replacements:
|
|
|
|
|
|
|
|
|
|
|
|
|
2020-10-26 09:40:08 -05:00
|
|
|
deletions:
|
2020-10-22 06:51:08 -05:00
|
|
|
|
2020-10-26 09:40:08 -05:00
|
|
|
Line 2: use text_edit::TextEdit;
|
|
|
|
Line 3: "\n\n"
|
|
|
|
Line 4: use crate::AstNode;
|
|
|
|
Line 5: "\n"
|
2020-10-22 06:51:08 -05:00
|
|
|
"#]],
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
2020-10-26 09:40:08 -05:00
|
|
|
fn delete_first() {
|
2020-10-22 06:51:08 -05:00
|
|
|
check_diff(
|
|
|
|
r#"
|
|
|
|
use text_edit::TextEdit;
|
|
|
|
|
|
|
|
use crate::AstNode;
|
|
|
|
"#,
|
|
|
|
r#"
|
|
|
|
use crate::AstNode;
|
|
|
|
"#,
|
|
|
|
expect![[r#"
|
|
|
|
insertions:
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
replacements:
|
|
|
|
|
2021-01-15 11:57:32 -06:00
|
|
|
Line 2: Token(IDENT@5..14 "text_edit") -> crate
|
2020-10-26 09:40:08 -05:00
|
|
|
Line 2: Token(IDENT@16..24 "TextEdit") -> AstNode
|
|
|
|
Line 2: Token(WHITESPACE@25..27 "\n\n") -> "\n"
|
2020-10-22 06:51:08 -05:00
|
|
|
|
|
|
|
deletions:
|
|
|
|
|
2020-10-26 09:40:08 -05:00
|
|
|
Line 3: use crate::AstNode;
|
|
|
|
Line 4: "\n"
|
2020-10-22 06:51:08 -05:00
|
|
|
"#]],
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn merge_use() {
|
|
|
|
check_diff(
|
|
|
|
r#"
|
|
|
|
use std::{
|
|
|
|
fmt,
|
|
|
|
hash::BuildHasherDefault,
|
|
|
|
ops::{self, RangeInclusive},
|
|
|
|
};
|
|
|
|
"#,
|
|
|
|
r#"
|
|
|
|
use std::fmt;
|
|
|
|
use std::hash::BuildHasherDefault;
|
|
|
|
use std::ops::{self, RangeInclusive};
|
|
|
|
"#,
|
|
|
|
expect![[r#"
|
|
|
|
insertions:
|
|
|
|
|
2020-11-09 11:42:32 -06:00
|
|
|
Line 2: After(Node(PATH_SEGMENT@5..8))
|
2020-10-22 06:51:08 -05:00
|
|
|
-> ::
|
|
|
|
-> fmt
|
2020-11-09 11:42:32 -06:00
|
|
|
Line 6: After(Token(WHITESPACE@86..87 "\n"))
|
2020-10-22 06:51:08 -05:00
|
|
|
-> use std::hash::BuildHasherDefault;
|
|
|
|
-> "\n"
|
|
|
|
-> use std::ops::{self, RangeInclusive};
|
|
|
|
-> "\n"
|
|
|
|
|
|
|
|
replacements:
|
|
|
|
|
|
|
|
Line 2: Token(IDENT@5..8 "std") -> std
|
|
|
|
|
|
|
|
deletions:
|
|
|
|
|
|
|
|
Line 2: ::
|
|
|
|
Line 2: {
|
|
|
|
fmt,
|
|
|
|
hash::BuildHasherDefault,
|
|
|
|
ops::{self, RangeInclusive},
|
|
|
|
}
|
|
|
|
"#]],
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn early_return_assist() {
|
|
|
|
check_diff(
|
|
|
|
r#"
|
|
|
|
fn main() {
|
|
|
|
if let Ok(x) = Err(92) {
|
|
|
|
foo(x);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
r#"
|
|
|
|
fn main() {
|
|
|
|
let x = match Err(92) {
|
|
|
|
Ok(it) => it,
|
|
|
|
_ => return,
|
|
|
|
};
|
|
|
|
foo(x);
|
|
|
|
}
|
|
|
|
"#,
|
|
|
|
expect![[r#"
|
|
|
|
insertions:
|
|
|
|
|
2020-11-09 11:42:32 -06:00
|
|
|
Line 3: After(Node(BLOCK_EXPR@40..63))
|
2020-10-22 06:51:08 -05:00
|
|
|
-> " "
|
|
|
|
-> match Err(92) {
|
|
|
|
Ok(it) => it,
|
|
|
|
_ => return,
|
|
|
|
}
|
|
|
|
-> ;
|
2020-11-09 11:42:32 -06:00
|
|
|
Line 3: After(Node(IF_EXPR@17..63))
|
2020-10-26 09:40:08 -05:00
|
|
|
-> "\n "
|
|
|
|
-> foo(x);
|
2020-10-22 06:51:08 -05:00
|
|
|
|
|
|
|
replacements:
|
|
|
|
|
|
|
|
Line 3: Token(IF_KW@17..19 "if") -> let
|
|
|
|
Line 3: Token(LET_KW@20..23 "let") -> x
|
|
|
|
Line 3: Node(BLOCK_EXPR@40..63) -> =
|
|
|
|
|
|
|
|
deletions:
|
|
|
|
|
|
|
|
Line 3: " "
|
|
|
|
Line 3: Ok(x)
|
|
|
|
Line 3: " "
|
|
|
|
Line 3: =
|
|
|
|
Line 3: " "
|
|
|
|
Line 3: Err(92)
|
|
|
|
"#]],
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn check_diff(from: &str, to: &str, expected_diff: Expect) {
|
|
|
|
let from_node = crate::SourceFile::parse(from).tree().syntax().clone();
|
|
|
|
let to_node = crate::SourceFile::parse(to).tree().syntax().clone();
|
|
|
|
let diff = super::diff(&from_node, &to_node);
|
|
|
|
|
|
|
|
let line_number =
|
|
|
|
|syn: &SyntaxElement| from[..syn.text_range().start().into()].lines().count();
|
|
|
|
|
|
|
|
let fmt_syntax = |syn: &SyntaxElement| match syn.kind() {
|
|
|
|
SyntaxKind::WHITESPACE => format!("{:?}", syn.to_string()),
|
|
|
|
_ => format!("{}", syn),
|
|
|
|
};
|
|
|
|
|
2020-11-09 11:42:32 -06:00
|
|
|
let insertions =
|
|
|
|
diff.insertions.iter().format_with("\n", |(k, v), f| -> Result<(), std::fmt::Error> {
|
|
|
|
f(&format!(
|
|
|
|
"Line {}: {:?}\n-> {}",
|
|
|
|
line_number(match k {
|
|
|
|
super::TreeDiffInsertPos::After(syn) => syn,
|
|
|
|
super::TreeDiffInsertPos::AsFirstChild(syn) => syn,
|
|
|
|
}),
|
|
|
|
k,
|
|
|
|
v.iter().format_with("\n-> ", |v, f| f(&fmt_syntax(v)))
|
|
|
|
))
|
|
|
|
});
|
2020-10-22 06:51:08 -05:00
|
|
|
|
|
|
|
let replacements = diff
|
|
|
|
.replacements
|
|
|
|
.iter()
|
|
|
|
.sorted_by_key(|(syntax, _)| syntax.text_range().start())
|
|
|
|
.format_with("\n", |(k, v), f| {
|
|
|
|
f(&format!("Line {}: {:?} -> {}", line_number(k), k, fmt_syntax(v)))
|
|
|
|
});
|
|
|
|
|
|
|
|
let deletions = diff
|
|
|
|
.deletions
|
|
|
|
.iter()
|
|
|
|
.format_with("\n", |v, f| f(&format!("Line {}: {}", line_number(v), &fmt_syntax(v))));
|
|
|
|
|
|
|
|
let actual = format!(
|
|
|
|
"insertions:\n\n{}\n\nreplacements:\n\n{}\n\ndeletions:\n\n{}\n",
|
|
|
|
insertions, replacements, deletions
|
|
|
|
);
|
|
|
|
expected_diff.assert_eq(&actual);
|
|
|
|
|
|
|
|
let mut from = from.to_owned();
|
|
|
|
let mut text_edit = TextEdit::builder();
|
|
|
|
diff.into_text_edit(&mut text_edit);
|
|
|
|
text_edit.finish().apply(&mut from);
|
|
|
|
assert_eq!(&*from, to, "diff did not turn `from` to `to`");
|
|
|
|
}
|
|
|
|
}
|