Unnamed repository; edit this file 'description' to name the repository.
internal: move test
| -rw-r--r-- | crates/hir_def/src/macro_expansion_tests.rs | 4 | ||||
| -rw-r--r-- | crates/hir_def/src/macro_expansion_tests/mbe/tt_conversion.rs | 18 | ||||
| -rw-r--r-- | crates/mbe/src/tests/expand.rs | 27 |
3 files changed, 20 insertions, 29 deletions
diff --git a/crates/hir_def/src/macro_expansion_tests.rs b/crates/hir_def/src/macro_expansion_tests.rs index 76bd0299fb..83765bfb51 100644 --- a/crates/hir_def/src/macro_expansion_tests.rs +++ b/crates/hir_def/src/macro_expansion_tests.rs @@ -20,7 +20,7 @@ use stdx::format_to; use syntax::{ ast::{self, edit::IndentLevel}, AstNode, - SyntaxKind::{self, IDENT}, + SyntaxKind::{self, IDENT, LIFETIME_IDENT}, SyntaxNode, T, }; @@ -103,7 +103,7 @@ fn pretty_print_macro_expansion(expn: SyntaxNode) -> String { _ if prev_kind.is_trivia() || curr_kind.is_trivia() => "", (T![=], _) | (_, T![=]) => " ", (T![;], _) => "\n", - (IDENT, IDENT) => " ", + (IDENT | LIFETIME_IDENT, IDENT | LIFETIME_IDENT) => " ", (IDENT, _) if curr_kind.is_keyword() => " ", (_, IDENT) if prev_kind.is_keyword() => " ", _ => "", diff --git a/crates/hir_def/src/macro_expansion_tests/mbe/tt_conversion.rs b/crates/hir_def/src/macro_expansion_tests/mbe/tt_conversion.rs index a24fe9bee2..3450cda3fd 100644 --- a/crates/hir_def/src/macro_expansion_tests/mbe/tt_conversion.rs +++ b/crates/hir_def/src/macro_expansion_tests/mbe/tt_conversion.rs @@ -64,6 +64,24 @@ fn f() { } #[test] +fn roundtrip_lifetime() { + check( + r#" +macro_rules! m { + ($($t:tt)*) => { $($t)*} +} +m!(static bar: &'static str = "hello";); +"#, + expect![[r#" +macro_rules! m { + ($($t:tt)*) => { $($t)*} +} +static bar: & 'static str = "hello"; +"#]], + ); +} + +#[test] fn broken_parenthesis_sequence() { check( r#" diff --git a/crates/mbe/src/tests/expand.rs b/crates/mbe/src/tests/expand.rs index df374aea98..360d24db57 100644 --- a/crates/mbe/src/tests/expand.rs +++ b/crates/mbe/src/tests/expand.rs @@ -167,33 +167,6 @@ SUBTREE $ } #[test] -fn test_lifetime_split() { - parse_macro( - r#" -macro_rules! foo { - ($($t:tt)*) => { $($t)*} -} -"#, - ) - .assert_expand( - r#"foo!(static bar: &'static str = "hello";);"#, - r#" -SUBTREE $ - IDENT static 17 - IDENT bar 18 - PUNCH : [alone] 19 - PUNCH & [alone] 20 - PUNCH ' [joint] 21 - IDENT static 22 - IDENT str 23 - PUNCH = [alone] 24 - LITERAL "hello" 25 - PUNCH ; [joint] 26 -"#, - ); -} - -#[test] fn test_expr_order() { let expanded = parse_macro( r#" |