Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit ebf8b1a

Browse files
committed
ide: insert whitespaces surrounding _ in macro expansion
1 parent 81805d4 commit ebf8b1a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

crates/ide-db/src/syntax_helpers/insert_whitespace_into_node.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ pub fn insert_ws_into(syn: SyntaxNode) -> SyntaxNode {
5757
|f: fn(SyntaxKind) -> bool, default| -> bool { last.map(f).unwrap_or(default) };
5858

5959
match tok.kind() {
60-
k if is_text(k) && is_next(|it| !it.is_punct(), true) => {
60+
k if is_text(k) && is_next(|it| !it.is_punct() || it == UNDERSCORE, false) => {
6161
mods.push(do_ws(after, tok));
6262
}
6363
L_CURLY if is_next(|it| it != R_CURLY, true) => {
@@ -118,5 +118,5 @@ pub fn insert_ws_into(syn: SyntaxNode) -> SyntaxNode {
118118
}
119119

120120
fn is_text(k: SyntaxKind) -> bool {
121-
k.is_keyword() || k.is_literal() || k == IDENT
121+
k.is_keyword() || k.is_literal() || k == IDENT || k == UNDERSCORE
122122
}

crates/ide/src/expand_macro.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ fn main() {
385385
"#,
386386
expect![[r#"
387387
foo
388-
0 "#]],
388+
0"#]],
389389
);
390390
}
391391

0 commit comments

Comments
 (0)