diff --git a/cli/src/main.rs b/cli/src/main.rs index db403fea..a8b4fd8b 100644 --- a/cli/src/main.rs +++ b/cli/src/main.rs @@ -55,7 +55,15 @@ fn run() -> error::Result<()> { .arg(Arg::with_name("quiet").long("quiet").short("q")) .arg(Arg::with_name("time").long("time").short("t")) .arg(Arg::with_name("allow-cancellation").long("cancel")) - .arg(Arg::with_name("timeout").long("timeout").takes_value(true)), + .arg(Arg::with_name("timeout").long("timeout").takes_value(true)) + .arg( + Arg::with_name("edits") + .long("edit") + .short("edit") + .takes_value(true) + .multiple(true) + .number_of_values(1), + ), ) .subcommand( SubCommand::with_name("test") @@ -135,6 +143,9 @@ fn run() -> error::Result<()> { let debug_graph = matches.is_present("debug-graph"); let quiet = matches.is_present("quiet"); let time = matches.is_present("time"); + let edits = matches + .values_of("edits") + .map_or(Vec::new(), |e| e.collect()); let allow_cancellation = matches.is_present("allow-cancellation"); let timeout = matches .value_of("timeout") @@ -166,6 +177,7 @@ fn run() -> error::Result<()> { has_error |= parse::parse_file_at_path( language, path, + &edits, max_path_length, quiet, time, diff --git a/cli/src/parse.rs b/cli/src/parse.rs index 8ab1a04f..95ecebc1 100644 --- a/cli/src/parse.rs +++ b/cli/src/parse.rs @@ -4,12 +4,20 @@ use std::io::{self, Write}; use std::path::Path; use std::sync::atomic::{AtomicUsize, Ordering}; use std::time::Instant; -use std::{fs, thread}; -use tree_sitter::{Language, LogType, Parser}; +use std::{fs, thread, usize}; +use tree_sitter::{InputEdit, Language, LogType, Parser, Point, Tree}; + +#[derive(Debug)] +pub struct Edit { + pub position: usize, + pub deleted_length: usize, + pub inserted_text: Vec, +} pub fn parse_file_at_path( language: Language, path: &Path, + edits: &Vec<&str>, max_path_length: usize, quiet: bool, print_time: bool, @@ -21,7 +29,7 @@ pub fn parse_file_at_path( let mut _log_session = None; let mut parser = Parser::new(); parser.set_language(language)?; - let source_code = fs::read(path) + let mut source_code = fs::read(path) .map_err(|e| Error(format!("Error reading source file {:?}: {}", path, e)))?; // If the `--cancel` flag was passed, then cancel the parse @@ -56,13 +64,19 @@ pub fn parse_file_at_path( let time = Instant::now(); let tree = parser.parse(&source_code, None); - let duration = time.elapsed(); - let duration_ms = duration.as_secs() * 1000 + duration.subsec_nanos() as u64 / 1000000; let stdout = io::stdout(); let mut stdout = stdout.lock(); - if let Some(tree) = tree { + if let Some(mut tree) = tree { + for edit in edits { + let edit = parse_edit_flag(&source_code, edit)?; + perform_edit(&mut tree, &mut source_code, &edit); + tree = parser.parse(&source_code, Some(&tree)).unwrap(); + } + + let duration = time.elapsed(); + let duration_ms = duration.as_secs() * 1000 + duration.subsec_nanos() as u64 / 1000000; let mut cursor = tree.walk(); if !quiet { @@ -129,12 +143,12 @@ pub fn parse_file_at_path( first_error = Some(node); break; } else { - cursor.goto_first_child(); + if !cursor.goto_first_child() { + break; + } } } else if !cursor.goto_next_sibling() { - if !cursor.goto_parent() { - break; - } + break; } } @@ -164,6 +178,8 @@ pub fn parse_file_at_path( return Ok(first_error.is_some()); } else if print_time { + let duration = time.elapsed(); + let duration_ms = duration.as_secs() * 1000 + duration.subsec_nanos() as u64 / 1000000; writeln!( &mut stdout, "{:width$}\t{} ms (timed out)", @@ -175,3 +191,91 @@ pub fn parse_file_at_path( Ok(false) } + +pub fn perform_edit(tree: &mut Tree, input: &mut Vec, edit: &Edit) -> InputEdit { + let start_byte = edit.position; + let old_end_byte = edit.position + edit.deleted_length; + let new_end_byte = edit.position + edit.inserted_text.len(); + let start_position = position_for_offset(input, start_byte); + let old_end_position = position_for_offset(input, old_end_byte); + input.splice(start_byte..old_end_byte, edit.inserted_text.iter().cloned()); + let new_end_position = position_for_offset(input, new_end_byte); + let edit = InputEdit { + start_byte, + old_end_byte, + new_end_byte, + start_position, + old_end_position, + new_end_position, + }; + tree.edit(&edit); + edit +} + +fn parse_edit_flag(source_code: &Vec, flag: &str) -> Result { + let error = || { + Error::from(format!(concat!( + "Invalid edit string '{}'. ", + "Edit strings must match the pattern ' '" + ), flag)) + }; + + // Three whitespace-separated parts: + // * edit position + // * deleted length + // * inserted text + let mut parts = flag.split(" "); + let position = parts.next().ok_or_else(error)?; + let deleted_length = parts.next().ok_or_else(error)?; + let inserted_text = parts.collect::>().join(" ").into_bytes(); + + // Position can either be a byte_offset or row,column pair, separated by a comma + let position = if position.contains(",") { + let mut parts = position.split(","); + let row = parts.next().ok_or_else(error)?; + let row = usize::from_str_radix(row, 10).map_err(|_| error())?; + let column = parts.next().ok_or_else(error)?; + let column = usize::from_str_radix(column, 10).map_err(|_| error())?; + offset_for_position(source_code, Point { row, column }) + } else { + usize::from_str_radix(position, 10).map_err(|_| error())? + }; + + // Deleted length must be a byte count. + let deleted_length = usize::from_str_radix(deleted_length, 10).map_err(|_| error())?; + + Ok(Edit { + position, + deleted_length, + inserted_text, + }) +} + +fn offset_for_position(input: &Vec, position: Point) -> usize { + let mut current_position = Point { row: 0, column: 0 }; + for (i, c) in input.iter().enumerate() { + if *c as char == '\n' { + current_position.row += 1; + current_position.column = 0; + } else { + current_position.column += 1; + } + if current_position > position { + return i; + } + } + return input.len(); +} + +fn position_for_offset(input: &Vec, offset: usize) -> Point { + let mut result = Point { row: 0, column: 0 }; + for c in &input[0..offset] { + if *c as char == '\n' { + result.row += 1; + result.column = 0; + } else { + result.column += 1; + } + } + result +} diff --git a/cli/src/tests/corpus_test.rs b/cli/src/tests/corpus_test.rs index dba86d83..76d68820 100644 --- a/cli/src/tests/corpus_test.rs +++ b/cli/src/tests/corpus_test.rs @@ -1,9 +1,10 @@ use super::helpers::allocations; -use super::helpers::edits::{get_random_edit, invert_edit, perform_edit}; +use super::helpers::edits::{get_random_edit, invert_edit}; use super::helpers::fixtures::{fixtures_dir, get_language, get_test_language}; use super::helpers::random::Rand; use super::helpers::scope_sequence::ScopeSequence; use crate::generate; +use crate::parse::perform_edit; use crate::test::{parse_tests, print_diff, print_diff_key, strip_sexp_fields, TestEntry}; use crate::util; use lazy_static::lazy_static; diff --git a/cli/src/tests/helpers/edits.rs b/cli/src/tests/helpers/edits.rs index e84477c4..8333c4de 100644 --- a/cli/src/tests/helpers/edits.rs +++ b/cli/src/tests/helpers/edits.rs @@ -1,13 +1,7 @@ use super::random::Rand; +use crate::parse::Edit; use std::ops::Range; use std::str; -use tree_sitter::{InputEdit, Point, Tree}; - -pub struct Edit { - pub position: usize, - pub deleted_length: usize, - pub inserted_text: Vec, -} #[derive(Debug)] pub struct ReadRecorder<'a> { @@ -56,26 +50,6 @@ impl<'a> ReadRecorder<'a> { } } -pub fn perform_edit(tree: &mut Tree, input: &mut Vec, edit: &Edit) -> InputEdit { - let start_byte = edit.position; - let old_end_byte = edit.position + edit.deleted_length; - let new_end_byte = edit.position + edit.inserted_text.len(); - let start_position = position_for_offset(input, start_byte); - let old_end_position = position_for_offset(input, old_end_byte); - input.splice(start_byte..old_end_byte, edit.inserted_text.iter().cloned()); - let new_end_position = position_for_offset(input, new_end_byte); - let edit = InputEdit { - start_byte, - old_end_byte, - new_end_byte, - start_position, - old_end_position, - new_end_position, - }; - tree.edit(&edit); - edit -} - pub fn invert_edit(input: &Vec, edit: &Edit) -> Edit { let position = edit.position; let removed_content = &input[position..(position + edit.deleted_length)]; @@ -130,16 +104,3 @@ pub fn get_random_edit(rand: &mut Rand, input: &Vec) -> Edit { } } } - -fn position_for_offset(input: &Vec, offset: usize) -> Point { - let mut result = Point { row: 0, column: 0 }; - for c in &input[0..offset] { - if *c as char == '\n' { - result.row += 1; - result.column = 0; - } else { - result.column += 1; - } - } - result -} diff --git a/cli/src/tests/node_test.rs b/cli/src/tests/node_test.rs index 098f1262..ebe404cd 100644 --- a/cli/src/tests/node_test.rs +++ b/cli/src/tests/node_test.rs @@ -1,7 +1,8 @@ -use super::helpers::edits::{get_random_edit, perform_edit}; +use super::helpers::edits::get_random_edit; use super::helpers::fixtures::{get_language, get_test_language}; use super::helpers::random::Rand; use crate::generate::generate_parser_for_grammar; +use crate::parse::perform_edit; use tree_sitter::{Node, Parser, Point, Tree}; const JSON_EXAMPLE: &'static str = r#" diff --git a/cli/src/tests/parser_test.rs b/cli/src/tests/parser_test.rs index 92d55779..5b36b6c0 100644 --- a/cli/src/tests/parser_test.rs +++ b/cli/src/tests/parser_test.rs @@ -1,6 +1,7 @@ -use super::helpers::edits::{perform_edit, Edit, ReadRecorder}; +use super::helpers::edits::ReadRecorder; use super::helpers::fixtures::{get_language, get_test_language}; use crate::generate::generate_parser_for_grammar; +use crate::parse::{perform_edit, Edit}; use std::sync::atomic::{AtomicUsize, Ordering}; use std::{thread, time}; use tree_sitter::{InputEdit, LogType, Parser, Point, Range}; diff --git a/cli/src/tests/tree_test.rs b/cli/src/tests/tree_test.rs index 7a04e800..4c03daa6 100644 --- a/cli/src/tests/tree_test.rs +++ b/cli/src/tests/tree_test.rs @@ -1,5 +1,6 @@ -use super::helpers::edits::{invert_edit, perform_edit, Edit}; +use super::helpers::edits::invert_edit; use super::helpers::fixtures::get_language; +use crate::parse::{perform_edit, Edit}; use std::str; use tree_sitter::{InputEdit, Parser, Point, Range, Tree};