Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-27 21:43:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't append "!" to non-bang macro name

Browse source
This commit is contained in:
Ryo Yoshida 2023-04-02 19:45:39 +09:00
parent 1ebac28f0d
commit 613e008593
No known key found for this signature in database
GPG key ID: E25698A930586171
2 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
crates/ide/src/expand_macro.rs
View file

@ -83,8 +83,10 @@ pub(crate) fn expand_macro(db: &RootDatabase, position: FilePosition) -> Option<
} }
} }
if let Some(mac) = ast::MacroCall::cast(node) { if let Some(mac) = ast::MacroCall::cast(node) {
let mut name = mac.path()?.segment()?.name_ref()?.to_string();
name.push('!');
break ( break (
mac.path()?.segment()?.name_ref()?.to_string(), name,
expand_macro_recur(&sema, &mac)?, expand_macro_recur(&sema, &mac)?,
mac.syntax().parent().map(|it| it.kind()).unwrap_or(SyntaxKind::MACRO_ITEMS), mac.syntax().parent().map(|it| it.kind()).unwrap_or(SyntaxKind::MACRO_ITEMS),
); );
@ -235,7 +237,7 @@ fn main() {
} }
"#, "#,
expect![[r#" expect![[r#"
bar bar!
5i64 as _"#]], 5i64 as _"#]],
); );
} }
@ -252,7 +254,7 @@ fn main() {
} }
"#, "#,
expect![[r#" expect![[r#"
bar bar!
for _ in 0..42{}"#]], for _ in 0..42{}"#]],
); );
} }
@ -273,7 +275,7 @@ macro_rules! baz {
f$0oo!(); f$0oo!();
"#, "#,
expect![[r#" expect![[r#"
foo foo!
fn b(){} fn b(){}
"#]], "#]],
); );
@ -294,7 +296,7 @@ macro_rules! foo {
f$0oo!(); f$0oo!();
"#, "#,
expect![[r#" expect![[r#"
foo foo!
fn some_thing() -> u32 { fn some_thing() -> u32 {
let a = 0; let a = 0;
a+10 a+10
@ -328,16 +330,16 @@ fn main() {
} }
"#, "#,
expect![[r#" expect![[r#"
match_ast match_ast!
{ {
if let Some(it) = ast::TraitDef::cast(container.clone()){} if let Some(it) = ast::TraitDef::cast(container.clone()){}
else if let Some(it) = ast::ImplDef::cast(container.clone()){} else if let Some(it) = ast::ImplDef::cast(container.clone()){}
else { else {
{ {
continue continue
} }
} }
}"#]], }"#]],
); );
} }
@ -358,7 +360,7 @@ fn main() {
} }
"#, "#,
expect![[r#" expect![[r#"
match_ast match_ast!
{}"#]], {}"#]],
); );
} }
@ -383,7 +385,7 @@ fn main() {
} }
"#, "#,
expect![[r#" expect![[r#"
foo foo!
{ {
macro_rules! bar { macro_rules! bar {
() => { () => {
@ -411,7 +413,7 @@ fn main() {
} }
"#, "#,
expect![[r#" expect![[r#"
foo foo!
"#]], "#]],
); );
} }
@ -433,7 +435,7 @@ fn main() {
} }
"#, "#,
expect![[r#" expect![[r#"
foo foo!
0"#]], 0"#]],
); );
} }
@ -451,7 +453,7 @@ fn main() {
} }
"#, "#,
expect![[r#" expect![[r#"
foo foo!
fn f<T>(_: &dyn ::std::marker::Copy){}"#]], fn f<T>(_: &dyn ::std::marker::Copy){}"#]],
); );
} }

2
editors/code/src/commands.ts
View file

@ -699,7 +699,7 @@ export function viewFullCrateGraph(ctx: CtxInit): Cmd {
// The contents of the file come from the `TextDocumentContentProvider` // The contents of the file come from the `TextDocumentContentProvider`
export function expandMacro(ctx: CtxInit): Cmd { export function expandMacro(ctx: CtxInit): Cmd {
function codeFormat(expanded: ra.ExpandedMacro): string { function codeFormat(expanded: ra.ExpandedMacro): string {
let result = `// Recursive expansion of ${expanded.name}! macro\n`; let result = `// Recursive expansion of ${expanded.name} macro\n`;
result += "// " + "=".repeat(result.length - 3); result += "// " + "=".repeat(result.length - 3);
result += "\n\n"; result += "\n\n";
result += expanded.expansion; result += expanded.expansion;