From e734190c24d2a5aca5b62c2b1ab7e6136017a25c Mon Sep 17 00:00:00 2001 From: pcpthm Date: Fri, 22 Mar 2019 02:05:12 +0900 Subject: Refactor parser fuzz testing --- crates/ra_syntax/src/fuzz.rs | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 crates/ra_syntax/src/fuzz.rs (limited to 'crates/ra_syntax/src/fuzz.rs') diff --git a/crates/ra_syntax/src/fuzz.rs b/crates/ra_syntax/src/fuzz.rs new file mode 100644 index 000000000..03f453a6e --- /dev/null +++ b/crates/ra_syntax/src/fuzz.rs @@ -0,0 +1,12 @@ +use crate::{SourceFile, validation, AstNode}; + +fn check_file_invariants(file: &SourceFile) { + let root = file.syntax(); + validation::validate_block_structure(root); + let _ = file.errors(); +} + +pub fn check_parser(text: &str) { + let file = SourceFile::parse(text); + check_file_invariants(&file); +} -- cgit v1.2.3 From 4c7142d0c9be90c8947deb788993d903b2e0a5d1 Mon Sep 17 00:00:00 2001 From: pcpthm Date: Fri, 22 Mar 2019 02:06:48 +0900 Subject: Add fuzz test for reparsing --- crates/ra_syntax/src/fuzz.rs | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) (limited to 'crates/ra_syntax/src/fuzz.rs') diff --git a/crates/ra_syntax/src/fuzz.rs b/crates/ra_syntax/src/fuzz.rs index 03f453a6e..efb080ac2 100644 --- a/crates/ra_syntax/src/fuzz.rs +++ b/crates/ra_syntax/src/fuzz.rs @@ -1,4 +1,6 @@ -use crate::{SourceFile, validation, AstNode}; +use crate::{SourceFile, validation, TextUnit, TextRange, AstNode}; +use ra_text_edit::AtomTextEdit; +use std::str::{self, FromStr}; fn check_file_invariants(file: &SourceFile) { let root = file.syntax(); @@ -10,3 +12,41 @@ pub fn check_parser(text: &str) { let file = SourceFile::parse(text); check_file_invariants(&file); } + +#[derive(Debug, Clone)] +pub struct CheckReparse { + text: String, + edit: AtomTextEdit, + edited_text: String, +} + +impl CheckReparse { + pub fn from_data(data: &[u8]) -> Option { + let data = str::from_utf8(data).ok()?; + let mut lines = data.lines(); + let delete_start = usize::from_str(lines.next()?).ok()?; + let delete_len = usize::from_str(lines.next()?).ok()?; + let insert = lines.next()?.to_string(); + let text = lines.collect::>().join("\n"); + text.get(delete_start..delete_start.checked_add(delete_len)?)?; // make sure delete is a valid range + let delete = TextRange::offset_len( + TextUnit::from_usize(delete_start), + TextUnit::from_usize(delete_len), + ); + let edited_text = + format!("{}{}{}", &text[..delete_start], &insert, &text[delete_start + delete_len..]); + let edit = AtomTextEdit { delete, insert }; + Some(CheckReparse { text, edit, edited_text }) + } + + pub fn run(&self) { + let file = SourceFile::parse(&self.text); + let new_file = file.reparse(&self.edit); + check_file_invariants(&new_file); + assert_eq!(&new_file.syntax().text().to_string(), &self.edited_text); + let full_reparse = SourceFile::parse(&self.edited_text); + for (a, b) in new_file.syntax().descendants().zip(full_reparse.syntax().descendants()) { + assert_eq!(a.kind(), b.kind(), "different syntax tree produced by a full reparse"); + } + } +} -- cgit v1.2.3 From c622000413351915d08e270e8962f5fbaedf0437 Mon Sep 17 00:00:00 2001 From: pcpthm Date: Fri, 22 Mar 2019 03:15:16 +0900 Subject: Improve reparse fuzz test --- crates/ra_syntax/src/fuzz.rs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'crates/ra_syntax/src/fuzz.rs') diff --git a/crates/ra_syntax/src/fuzz.rs b/crates/ra_syntax/src/fuzz.rs index efb080ac2..c7084bc6d 100644 --- a/crates/ra_syntax/src/fuzz.rs +++ b/crates/ra_syntax/src/fuzz.rs @@ -46,7 +46,19 @@ impl CheckReparse { assert_eq!(&new_file.syntax().text().to_string(), &self.edited_text); let full_reparse = SourceFile::parse(&self.edited_text); for (a, b) in new_file.syntax().descendants().zip(full_reparse.syntax().descendants()) { - assert_eq!(a.kind(), b.kind(), "different syntax tree produced by a full reparse"); + if (a.kind(), a.range()) != (b.kind(), b.range()) { + eprint!("original:\n{}", file.syntax().debug_dump()); + eprint!("reparsed:\n{}", new_file.syntax().debug_dump()); + eprint!("full reparse:\n{}", full_reparse.syntax().debug_dump()); + assert_eq!( + format!("{:?}", a), + format!("{:?}", b), + "different syntax tree produced by the full reparse" + ); + } } + // FIXME + // assert_eq!(new_file.errors(), full_reparse.errors()); + assert_eq!(new_file.errors().is_empty(), full_reparse.errors().is_empty()); } } -- cgit v1.2.3 From c60ec02d75a7cfa57a5a2b1e2256b70224deb531 Mon Sep 17 00:00:00 2001 From: pcpthm Date: Fri, 22 Mar 2019 04:11:21 +0900 Subject: Use template text to improve reparse fuzzing --- crates/ra_syntax/src/fuzz.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'crates/ra_syntax/src/fuzz.rs') diff --git a/crates/ra_syntax/src/fuzz.rs b/crates/ra_syntax/src/fuzz.rs index c7084bc6d..1153f0fb9 100644 --- a/crates/ra_syntax/src/fuzz.rs +++ b/crates/ra_syntax/src/fuzz.rs @@ -22,12 +22,16 @@ pub struct CheckReparse { impl CheckReparse { pub fn from_data(data: &[u8]) -> Option { + const PREFIX: &'static str = "fn main(){\n\t"; + const SUFFIX: &'static str = "\n}"; + let data = str::from_utf8(data).ok()?; let mut lines = data.lines(); - let delete_start = usize::from_str(lines.next()?).ok()?; + let delete_start = usize::from_str(lines.next()?).ok()? + PREFIX.len(); let delete_len = usize::from_str(lines.next()?).ok()?; let insert = lines.next()?.to_string(); let text = lines.collect::>().join("\n"); + let text = format!("{}{}{}", PREFIX, text, SUFFIX); text.get(delete_start..delete_start.checked_add(delete_len)?)?; // make sure delete is a valid range let delete = TextRange::offset_len( TextUnit::from_usize(delete_start), -- cgit v1.2.3 From 7669113e7c9088a2b656c720cca5c2e46e3cb896 Mon Sep 17 00:00:00 2001 From: pcpthm Date: Fri, 22 Mar 2019 04:14:28 +0900 Subject: Completely ignore errors for reparse fuzz --- crates/ra_syntax/src/fuzz.rs | 1 - 1 file changed, 1 deletion(-) (limited to 'crates/ra_syntax/src/fuzz.rs') diff --git a/crates/ra_syntax/src/fuzz.rs b/crates/ra_syntax/src/fuzz.rs index 1153f0fb9..af11b2e1a 100644 --- a/crates/ra_syntax/src/fuzz.rs +++ b/crates/ra_syntax/src/fuzz.rs @@ -63,6 +63,5 @@ impl CheckReparse { } // FIXME // assert_eq!(new_file.errors(), full_reparse.errors()); - assert_eq!(new_file.errors().is_empty(), full_reparse.errors().is_empty()); } } -- cgit v1.2.3