2019-02-21 06:24:42 -06:00
|
|
|
//! Implementation of incremental re-parsing.
|
|
|
|
//!
|
|
|
|
//! We use two simple strategies for this:
|
|
|
|
//! - if the edit modifies only a single token (like changing an identifier's
|
|
|
|
//! letter), we replace only this token.
|
|
|
|
//! - otherwise, we search for the nearest `{}` block which contains the edit
|
|
|
|
//! and try to parse only this block.
|
|
|
|
|
2020-08-12 10:06:49 -05:00
|
|
|
use parser::Reparser;
|
2020-08-12 10:03:06 -05:00
|
|
|
use text_edit::Indel;
|
2019-02-21 04:37:32 -06:00
|
|
|
|
2019-02-20 06:47:32 -06:00
|
|
|
use crate::{
|
|
|
|
algo,
|
|
|
|
parsing::{
|
2020-01-27 23:09:13 -06:00
|
|
|
lexer::{lex_single_syntax_kind, tokenize, Token},
|
2019-02-23 07:07:29 -06:00
|
|
|
text_token_source::TextTokenSource,
|
|
|
|
text_tree_sink::TextTreeSink,
|
2019-05-15 07:35:47 -05:00
|
|
|
},
|
2019-07-20 12:04:34 -05:00
|
|
|
syntax_node::{GreenNode, GreenToken, NodeOrToken, SyntaxElement, SyntaxNode},
|
2019-07-04 15:05:17 -05:00
|
|
|
SyntaxError,
|
|
|
|
SyntaxKind::*,
|
2020-04-24 16:40:41 -05:00
|
|
|
TextRange, TextSize, T,
|
2019-02-20 06:47:32 -06:00
|
|
|
};
|
|
|
|
|
2018-09-15 06:35:55 -05:00
|
|
|
pub(crate) fn incremental_reparse(
|
2019-01-07 07:15:47 -06:00
|
|
|
node: &SyntaxNode,
|
2020-05-05 16:15:49 -05:00
|
|
|
edit: &Indel,
|
2018-09-15 06:35:55 -05:00
|
|
|
errors: Vec<SyntaxError>,
|
2019-03-30 05:25:53 -05:00
|
|
|
) -> Option<(GreenNode, Vec<SyntaxError>, TextRange)> {
|
2020-02-17 18:11:16 -06:00
|
|
|
if let Some((green, new_errors, old_range)) = reparse_token(node, &edit) {
|
|
|
|
return Some((green, merge_errors(errors, new_errors, old_range, edit), old_range));
|
2019-03-30 05:25:53 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
if let Some((green, new_errors, old_range)) = reparse_block(node, &edit) {
|
|
|
|
return Some((green, merge_errors(errors, new_errors, old_range, edit), old_range));
|
|
|
|
}
|
|
|
|
None
|
2018-09-15 06:35:55 -05:00
|
|
|
}
|
|
|
|
|
2019-03-30 05:25:53 -05:00
|
|
|
fn reparse_token<'node>(
|
2019-03-21 13:27:00 -05:00
|
|
|
root: &'node SyntaxNode,
|
2020-05-05 16:15:49 -05:00
|
|
|
edit: &Indel,
|
2020-02-17 18:11:16 -06:00
|
|
|
) -> Option<(GreenNode, Vec<SyntaxError>, TextRange)> {
|
2020-01-26 12:44:49 -06:00
|
|
|
let prev_token = algo::find_covering_element(root, edit.delete).as_token()?.clone();
|
|
|
|
let prev_token_kind = prev_token.kind();
|
|
|
|
match prev_token_kind {
|
2018-10-31 16:38:18 -05:00
|
|
|
WHITESPACE | COMMENT | IDENT | STRING | RAW_STRING => {
|
2020-01-26 12:44:49 -06:00
|
|
|
if prev_token_kind == WHITESPACE || prev_token_kind == COMMENT {
|
2019-03-21 15:29:27 -05:00
|
|
|
// removing a new line may extends previous token
|
2020-01-26 12:44:49 -06:00
|
|
|
let deleted_range = edit.delete - prev_token.text_range().start();
|
|
|
|
if prev_token.text()[deleted_range].contains('\n') {
|
2019-03-21 15:29:27 -05:00
|
|
|
return None;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-01-26 12:44:49 -06:00
|
|
|
let mut new_text = get_text_after_edit(prev_token.clone().into(), &edit);
|
2020-02-17 18:11:16 -06:00
|
|
|
let (new_token_kind, new_err) = lex_single_syntax_kind(&new_text)?;
|
2018-09-15 06:35:55 -05:00
|
|
|
|
2020-01-26 12:44:49 -06:00
|
|
|
if new_token_kind != prev_token_kind
|
|
|
|
|| (new_token_kind == IDENT && is_contextual_kw(&new_text))
|
|
|
|
{
|
2018-09-15 06:35:55 -05:00
|
|
|
return None;
|
|
|
|
}
|
|
|
|
|
2020-01-26 12:44:49 -06:00
|
|
|
// Check that edited token is not a part of the bigger token.
|
|
|
|
// E.g. if for source code `bruh"str"` the user removed `ruh`, then
|
|
|
|
// `b` no longer remains an identifier, but becomes a part of byte string literal
|
|
|
|
if let Some(next_char) = root.text().char_at(prev_token.text_range().end()) {
|
|
|
|
new_text.push(next_char);
|
2020-01-27 23:09:13 -06:00
|
|
|
let token_with_next_char = lex_single_syntax_kind(&new_text);
|
|
|
|
if let Some((_kind, _error)) = token_with_next_char {
|
2019-03-21 13:27:00 -05:00
|
|
|
return None;
|
|
|
|
}
|
2020-01-26 12:44:49 -06:00
|
|
|
new_text.pop();
|
2019-03-21 13:27:00 -05:00
|
|
|
}
|
|
|
|
|
2020-01-26 12:44:49 -06:00
|
|
|
let new_token =
|
|
|
|
GreenToken::new(rowan::SyntaxKind(prev_token_kind.into()), new_text.into());
|
2020-02-17 18:11:16 -06:00
|
|
|
Some((
|
|
|
|
prev_token.replace_with(new_token),
|
|
|
|
new_err.into_iter().collect(),
|
|
|
|
prev_token.text_range(),
|
|
|
|
))
|
2018-09-15 06:35:55 -05:00
|
|
|
}
|
|
|
|
_ => None,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn reparse_block<'node>(
|
2019-03-30 05:25:53 -05:00
|
|
|
root: &'node SyntaxNode,
|
2020-05-05 16:15:49 -05:00
|
|
|
edit: &Indel,
|
2019-03-30 05:25:53 -05:00
|
|
|
) -> Option<(GreenNode, Vec<SyntaxError>, TextRange)> {
|
|
|
|
let (node, reparser) = find_reparsable_node(root, edit.delete)?;
|
2020-02-05 18:33:18 -06:00
|
|
|
let text = get_text_after_edit(node.clone().into(), edit);
|
2020-01-27 23:09:13 -06:00
|
|
|
|
|
|
|
let (tokens, new_lexer_errors) = tokenize(&text);
|
2018-09-15 06:35:55 -05:00
|
|
|
if !is_balanced(&tokens) {
|
|
|
|
return None;
|
|
|
|
}
|
2020-01-27 23:09:13 -06:00
|
|
|
|
2019-05-25 07:31:53 -05:00
|
|
|
let mut token_source = TextTokenSource::new(&text, &tokens);
|
2020-01-27 23:09:13 -06:00
|
|
|
let mut tree_sink = TextTreeSink::new(&text, &tokens);
|
2019-05-25 07:31:53 -05:00
|
|
|
reparser.parse(&mut token_source, &mut tree_sink);
|
2020-01-27 23:09:13 -06:00
|
|
|
|
|
|
|
let (green, mut new_parser_errors) = tree_sink.finish();
|
|
|
|
new_parser_errors.extend(new_lexer_errors);
|
|
|
|
|
|
|
|
Some((node.replace_with(green), new_parser_errors, node.text_range()))
|
2018-09-15 06:35:55 -05:00
|
|
|
}
|
|
|
|
|
2020-05-05 16:15:49 -05:00
|
|
|
fn get_text_after_edit(element: SyntaxElement, edit: &Indel) -> String {
|
2020-05-05 16:23:29 -05:00
|
|
|
let edit = Indel::replace(edit.delete - element.text_range().start(), edit.insert.clone());
|
2020-01-26 12:44:49 -06:00
|
|
|
|
2020-05-05 16:23:29 -05:00
|
|
|
let mut text = match element {
|
2019-07-20 12:04:34 -05:00
|
|
|
NodeOrToken::Token(token) => token.text().to_string(),
|
|
|
|
NodeOrToken::Node(node) => node.text().to_string(),
|
2019-03-30 05:25:53 -05:00
|
|
|
};
|
2020-05-05 16:23:29 -05:00
|
|
|
edit.apply(&mut text);
|
|
|
|
text
|
2018-09-15 06:35:55 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
fn is_contextual_kw(text: &str) -> bool {
|
2020-06-27 20:02:03 -05:00
|
|
|
matches!(text, "auto" | "default" | "union")
|
2018-09-15 06:35:55 -05:00
|
|
|
}
|
|
|
|
|
2019-07-18 11:23:05 -05:00
|
|
|
fn find_reparsable_node(node: &SyntaxNode, range: TextRange) -> Option<(SyntaxNode, Reparser)> {
|
2019-03-30 05:25:53 -05:00
|
|
|
let node = algo::find_covering_element(node, range);
|
2020-01-26 12:44:49 -06:00
|
|
|
|
2019-03-30 05:25:53 -05:00
|
|
|
let mut ancestors = match node {
|
2019-07-20 12:04:34 -05:00
|
|
|
NodeOrToken::Token(it) => it.parent().ancestors(),
|
|
|
|
NodeOrToken::Node(it) => it.ancestors(),
|
2019-03-30 05:25:53 -05:00
|
|
|
};
|
|
|
|
ancestors.find_map(|node| {
|
|
|
|
let first_child = node.first_child_or_token().map(|it| it.kind());
|
2019-02-21 03:12:04 -06:00
|
|
|
let parent = node.parent().map(|it| it.kind());
|
2019-02-21 04:37:32 -06:00
|
|
|
Reparser::for_node(node.kind(), first_child, parent).map(|r| (node, r))
|
2019-02-21 03:12:04 -06:00
|
|
|
})
|
2018-09-15 06:35:55 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
fn is_balanced(tokens: &[Token]) -> bool {
|
2018-10-17 18:25:37 -05:00
|
|
|
if tokens.is_empty()
|
2019-05-15 07:35:47 -05:00
|
|
|
|| tokens.first().unwrap().kind != T!['{']
|
|
|
|
|| tokens.last().unwrap().kind != T!['}']
|
2018-10-15 16:44:23 -05:00
|
|
|
{
|
2018-09-15 06:35:55 -05:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
let mut balance = 0usize;
|
2019-03-21 14:33:05 -05:00
|
|
|
for t in &tokens[1..tokens.len() - 1] {
|
2018-09-15 06:35:55 -05:00
|
|
|
match t.kind {
|
2019-05-15 07:35:47 -05:00
|
|
|
T!['{'] => balance += 1,
|
|
|
|
T!['}'] => {
|
2018-10-15 16:44:23 -05:00
|
|
|
balance = match balance.checked_sub(1) {
|
|
|
|
Some(b) => b,
|
|
|
|
None => return false,
|
|
|
|
}
|
|
|
|
}
|
2018-09-15 06:35:55 -05:00
|
|
|
_ => (),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
balance == 0
|
|
|
|
}
|
|
|
|
|
|
|
|
fn merge_errors(
|
|
|
|
old_errors: Vec<SyntaxError>,
|
|
|
|
new_errors: Vec<SyntaxError>,
|
2020-02-05 18:33:18 -06:00
|
|
|
range_before_reparse: TextRange,
|
2020-05-05 16:15:49 -05:00
|
|
|
edit: &Indel,
|
2018-09-15 06:35:55 -05:00
|
|
|
) -> Vec<SyntaxError> {
|
|
|
|
let mut res = Vec::new();
|
2020-02-05 18:33:18 -06:00
|
|
|
|
|
|
|
for old_err in old_errors {
|
2020-02-09 18:10:56 -06:00
|
|
|
let old_err_range = old_err.range();
|
2020-02-05 18:33:18 -06:00
|
|
|
if old_err_range.end() <= range_before_reparse.start() {
|
|
|
|
res.push(old_err);
|
|
|
|
} else if old_err_range.start() >= range_before_reparse.end() {
|
2020-04-24 16:40:41 -05:00
|
|
|
let inserted_len = TextSize::of(&edit.insert);
|
2020-02-05 18:33:18 -06:00
|
|
|
res.push(old_err.with_range((old_err_range + inserted_len) - edit.delete.len()));
|
|
|
|
// Note: extra parens are intentional to prevent uint underflow, HWAB (here was a bug)
|
2018-09-15 06:35:55 -05:00
|
|
|
}
|
|
|
|
}
|
2020-02-05 18:33:18 -06:00
|
|
|
res.extend(new_errors.into_iter().map(|new_err| {
|
|
|
|
// fighting borrow checker with a variable ;)
|
2020-02-09 18:08:49 -06:00
|
|
|
let offseted_range = new_err.range() + range_before_reparse.start();
|
2020-02-05 18:33:18 -06:00
|
|
|
new_err.with_range(offseted_range)
|
|
|
|
}));
|
2018-09-15 06:35:55 -05:00
|
|
|
res
|
|
|
|
}
|
2018-09-15 07:35:30 -05:00
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
2019-07-04 15:05:17 -05:00
|
|
|
use test_utils::{assert_eq_text, extract_range};
|
2018-12-06 12:16:37 -06:00
|
|
|
|
|
|
|
use super::*;
|
2019-07-04 15:05:17 -05:00
|
|
|
use crate::{AstNode, Parse, SourceFile};
|
2018-09-15 07:35:30 -05:00
|
|
|
|
2019-03-30 05:25:53 -05:00
|
|
|
fn do_check(before: &str, replace_with: &str, reparsed_len: u32) {
|
2018-09-15 10:05:08 -05:00
|
|
|
let (range, before) = extract_range(before);
|
2020-05-05 16:15:49 -05:00
|
|
|
let edit = Indel::replace(range, replace_with.to_owned());
|
2020-05-05 16:23:29 -05:00
|
|
|
let after = {
|
|
|
|
let mut after = before.clone();
|
|
|
|
edit.apply(&mut after);
|
|
|
|
after
|
|
|
|
};
|
2018-09-15 07:35:30 -05:00
|
|
|
|
2019-05-28 09:34:28 -05:00
|
|
|
let fully_reparsed = SourceFile::parse(&after);
|
2019-07-18 11:23:05 -05:00
|
|
|
let incrementally_reparsed: Parse<SourceFile> = {
|
2020-02-17 18:11:16 -06:00
|
|
|
let before = SourceFile::parse(&before);
|
2019-03-30 05:25:53 -05:00
|
|
|
let (green, new_errors, range) =
|
2020-02-17 18:11:16 -06:00
|
|
|
incremental_reparse(before.tree().syntax(), &edit, before.errors.to_vec()).unwrap();
|
2019-03-30 05:25:53 -05:00
|
|
|
assert_eq!(range.len(), reparsed_len.into(), "reparsed fragment has wrong length");
|
2019-07-18 11:23:05 -05:00
|
|
|
Parse::new(green, new_errors)
|
2018-09-15 10:05:08 -05:00
|
|
|
};
|
|
|
|
|
|
|
|
assert_eq_text!(
|
2019-07-20 04:48:24 -05:00
|
|
|
&format!("{:#?}", fully_reparsed.tree().syntax()),
|
|
|
|
&format!("{:#?}", incrementally_reparsed.tree().syntax()),
|
2019-03-30 05:25:53 -05:00
|
|
|
);
|
2020-02-17 18:11:16 -06:00
|
|
|
assert_eq!(fully_reparsed.errors(), incrementally_reparsed.errors());
|
2018-09-15 10:05:08 -05:00
|
|
|
}
|
|
|
|
|
2019-03-30 05:25:53 -05:00
|
|
|
#[test] // FIXME: some test here actually test token reparsing
|
2018-09-15 10:05:08 -05:00
|
|
|
fn reparse_block_tests() {
|
2018-10-15 16:44:23 -05:00
|
|
|
do_check(
|
|
|
|
r"
|
2018-09-15 07:35:30 -05:00
|
|
|
fn foo() {
|
|
|
|
let x = foo + <|>bar<|>
|
|
|
|
}
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
"baz",
|
2019-03-30 05:25:53 -05:00
|
|
|
3,
|
2018-10-15 16:44:23 -05:00
|
|
|
);
|
|
|
|
do_check(
|
|
|
|
r"
|
2018-09-15 07:35:30 -05:00
|
|
|
fn foo() {
|
|
|
|
let x = foo<|> + bar<|>
|
|
|
|
}
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
"baz",
|
2019-03-30 05:25:53 -05:00
|
|
|
25,
|
2018-10-15 16:44:23 -05:00
|
|
|
);
|
|
|
|
do_check(
|
|
|
|
r"
|
2018-09-15 07:35:30 -05:00
|
|
|
struct Foo {
|
|
|
|
f: foo<|><|>
|
|
|
|
}
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
",\n g: (),",
|
2019-03-30 05:25:53 -05:00
|
|
|
14,
|
2018-10-15 16:44:23 -05:00
|
|
|
);
|
|
|
|
do_check(
|
|
|
|
r"
|
2018-09-15 07:35:30 -05:00
|
|
|
fn foo {
|
|
|
|
let;
|
|
|
|
1 + 1;
|
|
|
|
<|>92<|>;
|
|
|
|
}
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
"62",
|
2019-03-30 05:25:53 -05:00
|
|
|
31, // FIXME: reparse only int literal here
|
2018-10-15 16:44:23 -05:00
|
|
|
);
|
|
|
|
do_check(
|
|
|
|
r"
|
2018-09-15 07:35:30 -05:00
|
|
|
mod foo {
|
|
|
|
fn <|><|>
|
|
|
|
}
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
"bar",
|
2019-03-30 05:25:53 -05:00
|
|
|
11,
|
2018-10-15 16:44:23 -05:00
|
|
|
);
|
2019-03-30 05:25:53 -05:00
|
|
|
|
2018-10-15 16:44:23 -05:00
|
|
|
do_check(
|
|
|
|
r"
|
2018-09-15 07:35:30 -05:00
|
|
|
trait Foo {
|
|
|
|
type <|>Foo<|>;
|
|
|
|
}
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
"Output",
|
2019-03-30 05:25:53 -05:00
|
|
|
3,
|
2018-10-15 16:44:23 -05:00
|
|
|
);
|
|
|
|
do_check(
|
|
|
|
r"
|
2018-09-15 07:35:30 -05:00
|
|
|
impl IntoIterator<Item=i32> for Foo {
|
|
|
|
f<|><|>
|
|
|
|
}
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
"n next(",
|
2019-03-30 05:25:53 -05:00
|
|
|
9,
|
2018-10-15 16:44:23 -05:00
|
|
|
);
|
2019-03-30 05:25:53 -05:00
|
|
|
do_check(r"use a::b::{foo,<|>,bar<|>};", "baz", 10);
|
2018-10-15 16:44:23 -05:00
|
|
|
do_check(
|
|
|
|
r"
|
2018-09-15 07:35:30 -05:00
|
|
|
pub enum A {
|
|
|
|
Foo<|><|>
|
|
|
|
}
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
"\nBar;\n",
|
2019-03-30 05:25:53 -05:00
|
|
|
11,
|
2018-10-15 16:44:23 -05:00
|
|
|
);
|
|
|
|
do_check(
|
|
|
|
r"
|
2018-09-15 07:35:30 -05:00
|
|
|
foo!{a, b<|><|> d}
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
", c[3]",
|
2019-03-30 05:25:53 -05:00
|
|
|
8,
|
2018-10-15 16:44:23 -05:00
|
|
|
);
|
|
|
|
do_check(
|
|
|
|
r"
|
2018-09-15 07:35:30 -05:00
|
|
|
fn foo() {
|
|
|
|
vec![<|><|>]
|
|
|
|
}
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
"123",
|
2019-03-30 05:25:53 -05:00
|
|
|
14,
|
2018-10-15 16:44:23 -05:00
|
|
|
);
|
|
|
|
do_check(
|
|
|
|
r"
|
2018-09-15 07:35:30 -05:00
|
|
|
extern {
|
|
|
|
fn<|>;<|>
|
|
|
|
}
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
" exit(code: c_int)",
|
2019-03-30 05:25:53 -05:00
|
|
|
11,
|
2018-10-15 16:44:23 -05:00
|
|
|
);
|
2018-09-15 10:05:08 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
2019-03-30 05:25:53 -05:00
|
|
|
fn reparse_token_tests() {
|
2018-10-15 16:44:23 -05:00
|
|
|
do_check(
|
|
|
|
r"<|><|>
|
2018-09-15 10:05:08 -05:00
|
|
|
fn foo() -> i32 { 1 }
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
"\n\n\n \n",
|
2019-03-30 05:25:53 -05:00
|
|
|
1,
|
2018-10-15 16:44:23 -05:00
|
|
|
);
|
|
|
|
do_check(
|
|
|
|
r"
|
2018-09-15 07:35:30 -05:00
|
|
|
fn foo() -> <|><|> {}
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
" \n",
|
2019-03-30 05:25:53 -05:00
|
|
|
2,
|
2018-10-15 16:44:23 -05:00
|
|
|
);
|
|
|
|
do_check(
|
|
|
|
r"
|
2018-09-15 10:05:08 -05:00
|
|
|
fn <|>foo<|>() -> i32 { 1 }
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
"bar",
|
2019-03-30 05:25:53 -05:00
|
|
|
3,
|
2018-10-15 16:44:23 -05:00
|
|
|
);
|
|
|
|
do_check(
|
|
|
|
r"
|
2018-09-15 10:05:08 -05:00
|
|
|
fn foo<|><|>foo() { }
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
"bar",
|
2019-03-30 05:25:53 -05:00
|
|
|
6,
|
2018-10-15 16:44:23 -05:00
|
|
|
);
|
|
|
|
do_check(
|
|
|
|
r"
|
2018-09-15 10:05:08 -05:00
|
|
|
fn foo /* <|><|> */ () {}
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
"some comment",
|
2019-03-30 05:25:53 -05:00
|
|
|
6,
|
2018-10-15 16:44:23 -05:00
|
|
|
);
|
|
|
|
do_check(
|
|
|
|
r"
|
2018-09-15 10:05:08 -05:00
|
|
|
fn baz <|><|> () {}
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
" \t\t\n\n",
|
2019-03-30 05:25:53 -05:00
|
|
|
2,
|
2018-10-15 16:44:23 -05:00
|
|
|
);
|
|
|
|
do_check(
|
|
|
|
r"
|
2018-09-15 10:05:08 -05:00
|
|
|
fn baz <|><|> () {}
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
" \t\t\n\n",
|
2019-03-30 05:25:53 -05:00
|
|
|
2,
|
2018-10-15 16:44:23 -05:00
|
|
|
);
|
|
|
|
do_check(
|
|
|
|
r"
|
2018-09-15 10:05:08 -05:00
|
|
|
/// foo <|><|>omment
|
|
|
|
mod { }
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
"c",
|
2019-03-30 05:25:53 -05:00
|
|
|
14,
|
2018-10-15 16:44:23 -05:00
|
|
|
);
|
|
|
|
do_check(
|
|
|
|
r#"
|
2018-09-15 07:35:30 -05:00
|
|
|
fn -> &str { "Hello<|><|>" }
|
2018-10-15 16:44:23 -05:00
|
|
|
"#,
|
|
|
|
", world",
|
2019-03-30 05:25:53 -05:00
|
|
|
7,
|
2018-10-15 16:44:23 -05:00
|
|
|
);
|
|
|
|
do_check(
|
|
|
|
r#"
|
2018-09-15 07:35:30 -05:00
|
|
|
fn -> &str { // "Hello<|><|>"
|
2018-10-15 16:44:23 -05:00
|
|
|
"#,
|
|
|
|
", world",
|
2019-03-30 05:25:53 -05:00
|
|
|
10,
|
2018-10-15 16:44:23 -05:00
|
|
|
);
|
|
|
|
do_check(
|
|
|
|
r##"
|
2018-09-15 10:05:08 -05:00
|
|
|
fn -> &str { r#"Hello<|><|>"#
|
2018-10-15 16:44:23 -05:00
|
|
|
"##,
|
|
|
|
", world",
|
2019-03-30 05:25:53 -05:00
|
|
|
10,
|
2018-10-15 16:44:23 -05:00
|
|
|
);
|
|
|
|
do_check(
|
|
|
|
r"
|
2018-09-15 10:05:08 -05:00
|
|
|
#[derive(<|>Copy<|>)]
|
|
|
|
enum Foo {
|
|
|
|
|
|
|
|
}
|
2018-10-15 16:44:23 -05:00
|
|
|
",
|
|
|
|
"Clone",
|
2019-03-30 05:25:53 -05:00
|
|
|
4,
|
2018-10-15 16:44:23 -05:00
|
|
|
);
|
2018-09-15 07:35:30 -05:00
|
|
|
}
|
2020-02-17 18:11:16 -06:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn reparse_str_token_with_error_unchanged() {
|
|
|
|
do_check(r#""<|>Unclosed<|> string literal"#, "Still unclosed", 24);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn reparse_str_token_with_error_fixed() {
|
|
|
|
do_check(r#""unterinated<|><|>"#, "\"", 12);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn reparse_block_with_error_in_middle_unchanged() {
|
|
|
|
do_check(
|
|
|
|
r#"fn main() {
|
|
|
|
if {}
|
|
|
|
32 + 4<|><|>
|
|
|
|
return
|
|
|
|
if {}
|
|
|
|
}"#,
|
|
|
|
"23",
|
|
|
|
105,
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn reparse_block_with_error_in_middle_fixed() {
|
|
|
|
do_check(
|
|
|
|
r#"fn main() {
|
|
|
|
if {}
|
|
|
|
32 + 4<|><|>
|
|
|
|
return
|
|
|
|
if {}
|
|
|
|
}"#,
|
|
|
|
";",
|
|
|
|
105,
|
|
|
|
)
|
|
|
|
}
|
2018-10-02 09:07:12 -05:00
|
|
|
}
|