Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 13:03:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #4781

Browse source 
4781: Remove redundancy in syntax highlighting tests r=matklad a=ltentrup

Follow up from #4683. Improves syntax highlighting testing by introducing a function that contains the boilerplate comparison code. Keeps the `ra_fixture` argument in the first position, thus, the editor syntax highlighting injection still works.

Co-authored-by: Leander Tentrup <leander.tentrup@gmail.com>
This commit is contained in:
bors[bot] 2020-06-08 09:48:38 +00:00 committed by GitHub
commit d8552d114c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
crates/ra_ide/src/syntax_highlighting/tests.rs
View file

@ -7,9 +7,21 @@ use crate::{
FileRange, TextRange, FileRange, TextRange,
}; };
/// Highlights the code given by the `ra_fixture` argument, renders the
/// result as HTML, and compares it with the HTML file given as `snapshot`.
/// Note that the `snapshot` file is overwritten by the rendered HTML.
fn check_highlighting(ra_fixture: &str, snapshot: &str, rainbow: bool) {
let (analysis, file_id) = single_file(ra_fixture);
let dst_file = project_dir().join(snapshot);
let actual_html = &analysis.highlight_as_html(file_id, rainbow).unwrap();
let expected_html = &read_text(&dst_file);
fs::write(dst_file, &actual_html).unwrap();
assert_eq_text!(expected_html, actual_html);
}
#[test] #[test]
fn test_highlighting() { fn test_highlighting() {
let (analysis, file_id) = single_file( check_highlighting(
r#" r#"
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
struct Foo { struct Foo {
@ -84,17 +96,14 @@ impl<T> Option<T> {
} }
"# "#
.trim(), .trim(),
"crates/ra_ide/src/snapshots/highlighting.html",
false,
); );
let dst_file = project_dir().join("crates/ra_ide/src/snapshots/highlighting.html");
let actual_html = &analysis.highlight_as_html(file_id, false).unwrap();
let expected_html = &read_text(&dst_file);
fs::write(dst_file, &actual_html).unwrap();
assert_eq_text!(expected_html, actual_html);
} }
#[test] #[test]
fn test_rainbow_highlighting() { fn test_rainbow_highlighting() {
let (analysis, file_id) = single_file( check_highlighting(
r#" r#"
fn main() { fn main() {
let hello = "hello"; let hello = "hello";
@ -110,12 +119,9 @@ fn bar() {
} }
"# "#
.trim(), .trim(),
"crates/ra_ide/src/snapshots/rainbow_highlighting.html",
true,
); );
let dst_file = project_dir().join("crates/ra_ide/src/snapshots/rainbow_highlighting.html");
let actual_html = &analysis.highlight_as_html(file_id, true).unwrap();
let expected_html = &read_text(&dst_file);
fs::write(dst_file, &actual_html).unwrap();
assert_eq_text!(expected_html, actual_html);
} }
#[test] #[test]
@ -153,7 +159,7 @@ fn test_ranges() {
#[test] #[test]
fn test_flattening() { fn test_flattening() {
let (analysis, file_id) = single_file( check_highlighting(
r##" r##"
fn fixture(ra_fixture: &str) {} fn fixture(ra_fixture: &str) {}
@ -167,13 +173,9 @@ fn main() {
); );
}"## }"##
.trim(), .trim(),
"crates/ra_ide/src/snapshots/highlight_injection.html",
false,
); );
let dst_file = project_dir().join("crates/ra_ide/src/snapshots/highlight_injection.html");
let actual_html = &analysis.highlight_as_html(file_id, false).unwrap();
let expected_html = &read_text(&dst_file);
fs::write(dst_file, &actual_html).unwrap();
assert_eq_text!(expected_html, actual_html);
} }
#[test] #[test]
@ -192,7 +194,7 @@ macro_rules! test {}
fn test_string_highlighting() { fn test_string_highlighting() {
// The format string detection is based on macro-expansion, // The format string detection is based on macro-expansion,
// thus, we have to copy the macro definition from `std` // thus, we have to copy the macro definition from `std`
let (analysis, file_id) = single_file( check_highlighting(
r#" r#"
macro_rules! println { macro_rules! println {
($($arg:tt)*) => ({ ($($arg:tt)*) => ({
@ -250,18 +252,14 @@ fn main() {
println!("{ничоси}", ничоси = 92); println!("{ничоси}", ничоси = 92);
}"# }"#
.trim(), .trim(),
"crates/ra_ide/src/snapshots/highlight_strings.html",
false,
); );
let dst_file = project_dir().join("crates/ra_ide/src/snapshots/highlight_strings.html");
let actual_html = &analysis.highlight_as_html(file_id, false).unwrap();
let expected_html = &read_text(&dst_file);
fs::write(dst_file, &actual_html).unwrap();
assert_eq_text!(expected_html, actual_html);
} }
#[test] #[test]
fn test_unsafe_highlighting() { fn test_unsafe_highlighting() {
let (analysis, file_id) = single_file( check_highlighting(
r#" r#"
unsafe fn unsafe_fn() {} unsafe fn unsafe_fn() {}
@ -282,10 +280,7 @@ fn main() {
} }
"# "#
.trim(), .trim(),
"crates/ra_ide/src/snapshots/highlight_unsafe.html",
false,
); );
let dst_file = project_dir().join("crates/ra_ide/src/snapshots/highlight_unsafe.html");
let actual_html = &analysis.highlight_as_html(file_id, false).unwrap();
let expected_html = &read_text(&dst_file);
fs::write(dst_file, &actual_html).unwrap();
assert_eq_text!(expected_html, actual_html);
} }