From 72b9a4fbd3c12f3250b9157a1d44230e04ec8b22 Mon Sep 17 00:00:00 2001 From: Kevaundray Wedderburn Date: Wed, 6 Jan 2021 20:15:48 +0000 Subject: Change <|> to $0 - Rebase --- crates/syntax/src/parsing/reparsing.rs | 56 +++++++++++++++++----------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'crates/syntax/src/parsing/reparsing.rs') diff --git a/crates/syntax/src/parsing/reparsing.rs b/crates/syntax/src/parsing/reparsing.rs index 190f5f67a..78eaf3410 100644 --- a/crates/syntax/src/parsing/reparsing.rs +++ b/crates/syntax/src/parsing/reparsing.rs @@ -223,7 +223,7 @@ mod tests { do_check( r" fn foo() { - let x = foo + <|>bar<|> + let x = foo + $0bar$0 } ", "baz", @@ -232,7 +232,7 @@ fn foo() { do_check( r" fn foo() { - let x = foo<|> + bar<|> + let x = foo$0 + bar$0 } ", "baz", @@ -241,7 +241,7 @@ fn foo() { do_check( r" struct Foo { - f: foo<|><|> + f: foo$0$0 } ", ",\n g: (),", @@ -252,7 +252,7 @@ struct Foo { fn foo { let; 1 + 1; - <|>92<|>; + $092$0; } ", "62", @@ -261,7 +261,7 @@ fn foo { do_check( r" mod foo { - fn <|><|> + fn $0$0 } ", "bar", @@ -271,7 +271,7 @@ mod foo { do_check( r" trait Foo { - type <|>Foo<|>; + type $0Foo$0; } ", "Output", @@ -280,17 +280,17 @@ trait Foo { do_check( r" impl IntoIterator for Foo { - f<|><|> + f$0$0 } ", "n next(", 9, ); - do_check(r"use a::b::{foo,<|>,bar<|>};", "baz", 10); + do_check(r"use a::b::{foo,$0,bar$0};", "baz", 10); do_check( r" pub enum A { - Foo<|><|> + Foo$0$0 } ", "\nBar;\n", @@ -298,7 +298,7 @@ pub enum A { ); do_check( r" -foo!{a, b<|><|> d} +foo!{a, b$0$0 d} ", ", c[3]", 8, @@ -306,7 +306,7 @@ foo!{a, b<|><|> d} do_check( r" fn foo() { - vec![<|><|>] + vec![$0$0] } ", "123", @@ -315,7 +315,7 @@ fn foo() { do_check( r" extern { - fn<|>;<|> + fn$0;$0 } ", " exit(code: c_int)", @@ -326,7 +326,7 @@ extern { #[test] fn reparse_token_tests() { do_check( - r"<|><|> + r"$0$0 fn foo() -> i32 { 1 } ", "\n\n\n \n", @@ -334,49 +334,49 @@ fn foo() -> i32 { 1 } ); do_check( r" -fn foo() -> <|><|> {} +fn foo() -> $0$0 {} ", " \n", 2, ); do_check( r" -fn <|>foo<|>() -> i32 { 1 } +fn $0foo$0() -> i32 { 1 } ", "bar", 3, ); do_check( r" -fn foo<|><|>foo() { } +fn foo$0$0foo() { } ", "bar", 6, ); do_check( r" -fn foo /* <|><|> */ () {} +fn foo /* $0$0 */ () {} ", "some comment", 6, ); do_check( r" -fn baz <|><|> () {} +fn baz $0$0 () {} ", " \t\t\n\n", 2, ); do_check( r" -fn baz <|><|> () {} +fn baz $0$0 () {} ", " \t\t\n\n", 2, ); do_check( r" -/// foo <|><|>omment +/// foo $0$0omment mod { } ", "c", @@ -384,28 +384,28 @@ mod { } ); do_check( r#" -fn -> &str { "Hello<|><|>" } +fn -> &str { "Hello$0$0" } "#, ", world", 7, ); do_check( r#" -fn -> &str { // "Hello<|><|>" +fn -> &str { // "Hello$0$0" "#, ", world", 10, ); do_check( r##" -fn -> &str { r#"Hello<|><|>"# +fn -> &str { r#"Hello$0$0"# "##, ", world", 10, ); do_check( r" -#[derive(<|>Copy<|>)] +#[derive($0Copy$0)] enum Foo { } @@ -417,12 +417,12 @@ enum Foo { #[test] fn reparse_str_token_with_error_unchanged() { - do_check(r#""<|>Unclosed<|> string literal"#, "Still unclosed", 24); + do_check(r#""$0Unclosed$0 string literal"#, "Still unclosed", 24); } #[test] fn reparse_str_token_with_error_fixed() { - do_check(r#""unterinated<|><|>"#, "\"", 12); + do_check(r#""unterinated$0$0"#, "\"", 12); } #[test] @@ -430,7 +430,7 @@ enum Foo { do_check( r#"fn main() { if {} - 32 + 4<|><|> + 32 + 4$0$0 return if {} }"#, @@ -444,7 +444,7 @@ enum Foo { do_check( r#"fn main() { if {} - 32 + 4<|><|> + 32 + 4$0$0 return if {} }"#, -- cgit v1.2.3