nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-18 18:47:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

ide: insert whitespaces surrounding _ in macro expansion

Browse Source
This commit is contained in:
andylizi 2022-05-24 07:35:47 +08:00
parent 81805d4cfc
commit ebf8b1a96e
No known key found for this signature in database
GPG Key ID: BFBFA8C85929F0E8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/ide-db/src/syntax_helpers/insert_whitespace_into_node.rs
View File

@ -57,7 +57,7 @@ pub fn insert_ws_into(syn: SyntaxNode) -> SyntaxNode {
|f: fn(SyntaxKind) -> bool, default| -> bool { last.map(f).unwrap_or(default) }; |f: fn(SyntaxKind) -> bool, default| -> bool { last.map(f).unwrap_or(default) };
match tok.kind() { match tok.kind() {
k if is_text(k) && is_next(|it| !it.is_punct(), true) => { k if is_text(k) && is_next(|it| !it.is_punct() || it == UNDERSCORE, false) => {
mods.push(do_ws(after, tok)); mods.push(do_ws(after, tok));
} }
L_CURLY if is_next(|it| it != R_CURLY, true) => { L_CURLY if is_next(|it| it != R_CURLY, true) => {
@ -118,5 +118,5 @@ pub fn insert_ws_into(syn: SyntaxNode) -> SyntaxNode {
} }
fn is_text(k: SyntaxKind) -> bool { fn is_text(k: SyntaxKind) -> bool {
k.is_keyword() || k.is_literal() || k == IDENT k.is_keyword() || k.is_literal() || k == IDENT || k == UNDERSCORE
} }

2
crates/ide/src/expand_macro.rs
View File

@ -385,7 +385,7 @@ fn main() {
"#, "#,
expect![[r#" expect![[r#"
foo foo
0 "#]], 0"#]],
); );
} }