language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 05:15:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

rename Edit to TextEdit and AtomEdit to AtomTextEdit

Browse source
This commit is contained in:
Bernardo 2018-12-11 19:07:17 +01:00
parent 7344d28768
commit 0527e3b283
11 changed files with 92 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/ra_syntax/src/reparsing.rs
View file

@ -6,11 +6,11 @@ use crate::parser_impl;
use crate::text_utils::replace_range;
use crate::yellow::{self, GreenNode, SyntaxError, SyntaxNodeRef};
use crate::{SyntaxKind::*, TextRange, TextUnit};
use ra_text_edit::AtomEdit;
use ra_text_edit::AtomTextEdit;
pub(crate) fn incremental_reparse(
node: SyntaxNodeRef,
edit: &AtomEdit,
edit: &AtomTextEdit,
errors: Vec<SyntaxError>,
) -> Option<(GreenNode, Vec<SyntaxError>)> {
let (node, green, new_errors) =
@ -22,7 +22,7 @@ pub(crate) fn incremental_reparse(
fn reparse_leaf<'node>(
node: SyntaxNodeRef<'node>,
edit: &AtomEdit,
edit: &AtomTextEdit,
) -> Option<(SyntaxNodeRef<'node>, GreenNode, Vec<SyntaxError>)> {
let node = algo::find_covering_node(node, edit.delete);
match node.kind() {
@ -48,7 +48,7 @@ fn reparse_leaf<'node>(
fn reparse_block<'node>(
node: SyntaxNodeRef<'node>,
edit: &AtomEdit,
edit: &AtomTextEdit,
) -> Option<(SyntaxNodeRef<'node>, GreenNode, Vec<SyntaxError>)> {
let (node, reparser) = find_reparsable_node(node, edit.delete)?;
let text = get_text_after_edit(node, &edit);
@ -61,7 +61,7 @@ fn reparse_block<'node>(
Some((node, green, new_errors))
}
fn get_text_after_edit(node: SyntaxNodeRef, edit: &AtomEdit) -> String {
fn get_text_after_edit(node: SyntaxNodeRef, edit: &AtomTextEdit) -> String {
replace_range(
node.text().to_string(),
edit.delete - node.range().start(),
@ -139,7 +139,7 @@ fn merge_errors(
old_errors: Vec<SyntaxError>,
new_errors: Vec<SyntaxError>,
old_node: SyntaxNodeRef,
edit: &AtomEdit,
edit: &AtomTextEdit,
) -> Vec<SyntaxError> {
let mut res = Vec::new();
for e in old_errors {
@ -166,7 +166,7 @@ mod tests {
where
for<'a> F: Fn(
SyntaxNodeRef<'a>,
&AtomEdit,
&AtomTextEdit,
) -> Option<(SyntaxNodeRef<'a>, GreenNode, Vec<SyntaxError>)>,
{
let (range, before) = extract_range(before);
@ -175,7 +175,7 @@ mod tests {
let fully_reparsed = SourceFileNode::parse(&after);
let incrementally_reparsed = {
let f = SourceFileNode::parse(&before);
let edit = AtomEdit {
let edit = AtomTextEdit {
delete: range,
insert: replace_with.to_string(),
};