Unnamed repository; edit this file 'description' to name the repository.
drop obsolete tests
Aleksey Kladov 2021-10-10
parent 0f849a7 · commit bfc5d85
-rw-r--r--crates/mbe/src/tests.rs205
-rw-r--r--crates/mbe/src/tests/expand.rs98
2 files changed, 2 insertions, 301 deletions
diff --git a/crates/mbe/src/tests.rs b/crates/mbe/src/tests.rs
index 78e24a37e6..f4d7e60595 100644
--- a/crates/mbe/src/tests.rs
+++ b/crates/mbe/src/tests.rs
@@ -1,210 +1,9 @@
-mod expand;
+use std::iter;
-use std::{fmt::Write, iter};
-
-use syntax::{ast, AstNode, NodeOrToken, SyntaxNode, WalkEvent};
-use test_utils::assert_eq_text;
-
-use crate::ParserEntryPoint;
+use syntax::{ast, AstNode};
use super::*;
-pub(crate) struct MacroFixture {
- rules: MacroRules,
-}
-
-pub(crate) struct MacroFixture2 {
- rules: MacroDef,
-}
-
-macro_rules! impl_fixture {
- ($name:ident) => {
- impl $name {
- pub(crate) fn expand_tt(&self, invocation: &str) -> tt::Subtree {
- self.try_expand_tt(invocation).unwrap()
- }
-
- fn try_expand_tt(&self, invocation: &str) -> Result<tt::Subtree, ExpandError> {
- let source_file = ast::SourceFile::parse(invocation).tree();
- let macro_invocation =
- source_file.syntax().descendants().find_map(ast::MacroCall::cast).unwrap();
-
- let (invocation_tt, _) =
- syntax_node_to_token_tree(macro_invocation.token_tree().unwrap().syntax());
-
- self.rules.expand(&invocation_tt).result()
- }
-
- #[allow(unused)]
- fn assert_expand_err(&self, invocation: &str, err: &ExpandError) {
- assert_eq!(self.try_expand_tt(invocation).as_ref(), Err(err));
- }
-
- #[allow(unused)]
- fn expand_items(&self, invocation: &str) -> SyntaxNode {
- let expanded = self.expand_tt(invocation);
- token_tree_to_syntax_node(&expanded, ParserEntryPoint::Items)
- .unwrap()
- .0
- .syntax_node()
- }
-
- #[allow(unused)]
- fn expand_statements(&self, invocation: &str) -> SyntaxNode {
- let expanded = self.expand_tt(invocation);
- token_tree_to_syntax_node(&expanded, ParserEntryPoint::Statements)
- .unwrap()
- .0
- .syntax_node()
- }
-
- #[allow(unused)]
- fn expand_expr(&self, invocation: &str) -> SyntaxNode {
- let expanded = self.expand_tt(invocation);
- token_tree_to_syntax_node(&expanded, ParserEntryPoint::Expr)
- .unwrap()
- .0
- .syntax_node()
- }
-
- #[allow(unused)]
- fn assert_expand_tt(&self, invocation: &str, expected: &str) {
- let expansion = self.expand_tt(invocation);
- assert_eq!(expansion.to_string(), expected);
- }
-
- #[allow(unused)]
- fn assert_expand(&self, invocation: &str, expected: &str) {
- let expansion = self.expand_tt(invocation);
- let actual = format!("{:?}", expansion);
- test_utils::assert_eq_text!(&expected.trim(), &actual.trim());
- }
-
- #[allow(unused)]
- fn assert_expand_items(&self, invocation: &str, expected: &str) -> &$name {
- self.assert_expansion(ParserEntryPoint::Items, invocation, expected);
- self
- }
-
- #[allow(unused)]
- fn assert_expand_statements(&self, invocation: &str, expected: &str) -> &$name {
- self.assert_expansion(ParserEntryPoint::Statements, invocation, expected);
- self
- }
-
- fn assert_expansion(&self, kind: ParserEntryPoint, invocation: &str, expected: &str) {
- let expanded = self.expand_tt(invocation);
- assert_eq!(expanded.to_string(), expected);
-
- let expected = expected.replace("$crate", "C_C__C");
-
- // wrap the given text to a macro call
- let expected = {
- let wrapped = format!("wrap_macro!( {} )", expected);
- let wrapped = ast::SourceFile::parse(&wrapped);
- let wrapped = wrapped
- .tree()
- .syntax()
- .descendants()
- .find_map(ast::TokenTree::cast)
- .unwrap();
- let mut wrapped = syntax_node_to_token_tree(wrapped.syntax()).0;
- wrapped.delimiter = None;
- wrapped
- };
-
- let expanded_tree =
- token_tree_to_syntax_node(&expanded, kind).unwrap().0.syntax_node();
- let expanded_tree = debug_dump_ignore_spaces(&expanded_tree).trim().to_string();
-
- let expected_tree =
- token_tree_to_syntax_node(&expected, kind).unwrap().0.syntax_node();
- let expected_tree = debug_dump_ignore_spaces(&expected_tree).trim().to_string();
-
- let expected_tree = expected_tree.replace("C_C__C", "$crate");
- assert_eq!(
- expanded_tree, expected_tree,
- "\nleft:\n{}\nright:\n{}",
- expanded_tree, expected_tree,
- );
- }
- }
- };
-}
-
-impl_fixture!(MacroFixture);
-impl_fixture!(MacroFixture2);
-
-pub(crate) fn parse_macro(ra_fixture: &str) -> MacroFixture {
- let definition_tt = parse_macro_rules_to_tt(ra_fixture);
- let rules = MacroRules::parse(&definition_tt).unwrap();
- MacroFixture { rules }
-}
-
-pub(crate) fn parse_to_token_tree_by_syntax(ra_fixture: &str) -> tt::Subtree {
- let source_file = ast::SourceFile::parse(ra_fixture).ok().unwrap();
- let tt = syntax_node_to_token_tree(source_file.syntax()).0;
-
- let parsed = parse_to_token_tree(ra_fixture).unwrap().0;
- assert_eq!(tt, parsed);
-
- parsed
-}
-
-fn parse_macro_rules_to_tt(ra_fixture: &str) -> tt::Subtree {
- let source_file = ast::SourceFile::parse(ra_fixture).ok().unwrap();
- let macro_definition =
- source_file.syntax().descendants().find_map(ast::MacroRules::cast).unwrap();
-
- let (definition_tt, _) =
- syntax_node_to_token_tree(macro_definition.token_tree().unwrap().syntax());
-
- let parsed = parse_to_token_tree(
- &ra_fixture[macro_definition.token_tree().unwrap().syntax().text_range()],
- )
- .unwrap()
- .0;
- assert_eq!(definition_tt, parsed);
-
- definition_tt
-}
-
-fn debug_dump_ignore_spaces(node: &syntax::SyntaxNode) -> String {
- let mut level = 0;
- let mut buf = String::new();
- macro_rules! indent {
- () => {
- for _ in 0..level {
- buf.push_str(" ");
- }
- };
- }
-
- for event in node.preorder_with_tokens() {
- match event {
- WalkEvent::Enter(element) => {
- match element {
- NodeOrToken::Node(node) => {
- indent!();
- writeln!(buf, "{:?}", node.kind()).unwrap();
- }
- NodeOrToken::Token(token) => match token.kind() {
- syntax::SyntaxKind::WHITESPACE => {}
- _ => {
- indent!();
- writeln!(buf, "{:?}", token.kind()).unwrap();
- }
- },
- }
- level += 1;
- }
- WalkEvent::Leave(_) => level -= 1,
- }
- }
-
- buf
-}
-
#[test]
fn test_node_to_tt_censor() {
use syntax::ast::{HasAttrs, HasModuleItem};
diff --git a/crates/mbe/src/tests/expand.rs b/crates/mbe/src/tests/expand.rs
deleted file mode 100644
index 3380e01fbc..0000000000
--- a/crates/mbe/src/tests/expand.rs
+++ /dev/null
@@ -1,98 +0,0 @@
-use ::parser::ParserEntryPoint;
-use syntax::{SyntaxKind::IDENT, T};
-
-use super::*;
-
-// Good first issue (although a slightly challenging one):
-//
-// * Pick a random test from here
-// https://github.com/intellij-rust/intellij-rust/blob/c4e9feee4ad46e7953b1948c112533360b6087bb/src/test/kotlin/org/rust/lang/core/macros/RsMacroExpansionTest.kt
-// * Port the test to rust and add it to this module
-// * Make it pass :-)
-
-#[test]
-fn test_token_id_shift() {
- let expansion = parse_macro(
- r#"
-macro_rules! foobar {
- ($e:ident) => { foo bar $e }
-}
-"#,
- )
- .expand_tt("foobar!(baz);");
-
- fn get_id(t: &tt::TokenTree) -> Option<u32> {
- if let tt::TokenTree::Leaf(tt::Leaf::Ident(ident)) = t {
- return Some(ident.id.0);
- }
- None
- }
-
- assert_eq!(expansion.token_trees.len(), 3);
- // {($e:ident) => { foo bar $e }}
- // 012345 67 8 9 T 12
- assert_eq!(get_id(&expansion.token_trees[0]), Some(9));
- assert_eq!(get_id(&expansion.token_trees[1]), Some(10));
-
- // The input args of macro call include parentheses:
- // (baz)
- // So baz should be 12+1+1
- assert_eq!(get_id(&expansion.token_trees[2]), Some(14));
-}
-
-#[test]
-fn test_token_map() {
- let expanded = parse_macro(
- r#"
-macro_rules! foobar {
- ($e:ident) => { fn $e() {} }
-}
-"#,
- )
- .expand_tt("foobar!(baz);");
-
- let (node, token_map) = token_tree_to_syntax_node(&expanded, ParserEntryPoint::Items).unwrap();
- let content = node.syntax_node().to_string();
-
- let get_text = |id, kind| -> String {
- content[token_map.first_range_by_token(id, kind).unwrap()].to_string()
- };
-
- assert_eq!(expanded.token_trees.len(), 4);
- // {($e:ident) => { fn $e() {} }}
- // 012345 67 8 9 T12 3
-
- assert_eq!(get_text(tt::TokenId(9), IDENT), "fn");
- assert_eq!(get_text(tt::TokenId(12), T!['(']), "(");
- assert_eq!(get_text(tt::TokenId(13), T!['{']), "{");
-}
-
-fn to_subtree(tt: &tt::TokenTree) -> &tt::Subtree {
- if let tt::TokenTree::Subtree(subtree) = tt {
- return subtree;
- }
- unreachable!("It is not a subtree");
-}
-
-fn to_punct(tt: &tt::TokenTree) -> &tt::Punct {
- if let tt::TokenTree::Leaf(tt::Leaf::Punct(lit)) = tt {
- return lit;
- }
- unreachable!("It is not a Punct");
-}
-
-#[test]
-fn test_attr_to_token_tree() {
- let expansion = parse_to_token_tree_by_syntax(
- r#"
- #[derive(Copy)]
- struct Foo;
- "#,
- );
-
- assert_eq!(to_punct(&expansion.token_trees[0]).char, '#');
- assert_eq!(
- to_subtree(&expansion.token_trees[1]).delimiter_kind(),
- Some(tt::DelimiterKind::Bracket)
- );
-}