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

Auto merge of #13185 - ChayimFriedman2:insert-ws-in-static-const-macro, r=Veykril

Browse source 
fix: Insert whitespaces into static & const bodies if they are expanded from macro on hover

Partially fixes #13143.

To resolve the other part we need to expand macros in unevaluated static & const bodies, and I'm not sure we want to. If for example it includes a call to `assert!()`, expanding it will lead to worse hover.
This commit is contained in:
bors 2022-09-05 11:10:40 +00:00
commit 5be2e6574d
3 changed files with 77 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/ide-db/src/syntax_helpers/insert_whitespace_into_node.rs
View file

@ -95,7 +95,7 @@ pub fn insert_ws_into(syn: SyntaxNode) -> SyntaxNode {
AS_KW | DYN_KW | IMPL_KW | CONST_KW => {
mods.push(do_ws(after, tok));
}
T![;] => {
T![;] if is_next(|it| it != R_CURLY, true) => {
if indent > 0 {
mods.push(do_indent(after, tok, indent));
}