language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 12:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Add proper test for literals and fixed typo bug

Browse source
This commit is contained in:
Edwin Cheng 2019-04-05 20:58:24 +08:00
parent 1ea0238e53
commit 7abc06bd57
3 changed files with 51 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/ra_mbe/src/lib.rs
View file

@ -167,7 +167,7 @@ impl_froms!(TokenTree: Leaf, Subtree);
)
}
fn create_rules(macro_definition: &str) -> MacroRules {
pub(crate) fn create_rules(macro_definition: &str) -> MacroRules {
let source_file = ast::SourceFile::parse(macro_definition);
let macro_definition =
source_file.syntax().descendants().find_map(ast::MacroCall::cast).unwrap();
@ -176,7 +176,7 @@ impl_froms!(TokenTree: Leaf, Subtree);
crate::MacroRules::parse(&definition_tt).unwrap()
}
fn expand(rules: &MacroRules, invocation: &str) -> tt::Subtree {
pub(crate) fn expand(rules: &MacroRules, invocation: &str) -> tt::Subtree {
let source_file = ast::SourceFile::parse(invocation);
let macro_invocation =
source_file.syntax().descendants().find_map(ast::MacroCall::cast).unwrap();
@ -186,7 +186,7 @@ impl_froms!(TokenTree: Leaf, Subtree);
rules.expand(&invocation_tt).unwrap()
}
fn assert_expansion(rules: &MacroRules, invocation: &str, expansion: &str) {
pub(crate) fn assert_expansion(rules: &MacroRules, invocation: &str, expansion: &str) {
let expanded = expand(rules, invocation);
assert_eq!(expanded.to_string(), expansion);
}
@ -338,7 +338,7 @@ SOURCE_FILE@[0; 40)
}
#[test]
fn expand_literals_to_item_list() {
fn expand_literals_to_token_tree() {
fn to_subtree(tt: &tt::TokenTree) -> &tt::Subtree {
if let tt::TokenTree::Subtree(subtree) = tt {
return &subtree;
@ -361,6 +361,7 @@ SOURCE_FILE@[0; 40)
let a = 'c';
let c = 1000;
let f = 12E+99_f64;
let s = "rust1";
}
}
}
@ -375,5 +376,7 @@ SOURCE_FILE@[0; 40)
assert_eq!(to_literal(&stm_tokens[5 + 3]).text, "1000");
// [let] [f] [=] [12E+99_f64] [;]
assert_eq!(to_literal(&stm_tokens[10 + 3]).text, "12E+99_f64");
// [let] [s] [=] ["rust1"] [;]
assert_eq!(to_literal(&stm_tokens[15 + 3]).text, "\"rust1\"");
}
}