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

Attach doc-comment to declaration if there are newlines in between

Browse source 
This commit changes the parser to attach doc-comments to the corresponding declaration in case there are newlines in between the doc-comment and the declaration.
This commit is contained in:
Leander Tentrup 2020-03-31 14:19:21 +02:00
parent 668980d865
commit 77f89a700b
3 changed files with 32 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/ra_syntax/src/parsing/text_tree_sink.rs
View file

@ -149,10 +149,21 @@ fn n_attached_trivias<'a>(
MACRO_CALL | CONST_DEF | TYPE_ALIAS_DEF | STRUCT_DEF | ENUM_DEF | ENUM_VARIANT | FN_DEF
| TRAIT_DEF | MODULE | RECORD_FIELD_DEF | STATIC_DEF => {
let mut res = 0;
for (i, (kind, text)) in trivias.enumerate() {
let mut trivias = trivias.enumerate().peekable();
while let Some((i, (kind, text))) = trivias.next() {
match kind {
WHITESPACE => {
if text.contains("\n\n") {
// we check whether the next token is a doc-comment
// and skip the whitespace in this case
if let Some((peek_kind, peek_text)) =
trivias.peek().map(|(_, pair)| pair)
{
if *peek_kind == COMMENT && peek_text.starts_with("///") {
continue;
}
}
break;
}
}