mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unconditionally trim the end of comments

Browse Source
This commit is contained in:
kjeremy 2019-07-31 13:59:14 -04:00
parent d65dc40348
commit 0f61aa1f09
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crates/ra_syntax/src/ast.rs
View File

@ -181,10 +181,7 @@ mod foo {}
.ok()
.unwrap();
let module = file.syntax().descendants().find_map(Module::cast).unwrap();
assert_eq!(
" this\n is\n mod foo\n ",
module.doc_comment_text().unwrap()
);
assert_eq!(" this\n is\n mod foo", module.doc_comment_text().unwrap());
}
#[test]

13
crates/ra_syntax/src/ast/traits.rs
View File

@ -115,8 +115,8 @@ fn doc_comments(&self) -> CommentIter {
}
/// Returns the textual content of a doc comment block as a single string.
/// That is, strips leading `///` or trailing `*/` (+ optional 1 character of whitespace in either direction)
/// and joins lines.
/// That is, strips leading `///` (+ optional 1 character of whitespace),
/// trailing `*/`, trailing whitespace and then joins the lines.
fn doc_comment_text(&self) -> Option<String> {
let mut has_comments = false;
let docs = self
@ -137,17 +137,12 @@ fn doc_comment_text(&self) -> Option<String> {
};
let end = if comment.kind().shape.is_block() && line.ends_with("*/") {
// FIXME: Use `nth_back` here once stable
if line.chars().rev().nth(2).map(|c| c.is_whitespace()).unwrap_or(false) {
line.len() - 3
} else {
line.len() - 2
}
line.len() - 2
} else {
line.len()
};
line[pos..end].to_owned()
line[pos..end].trim_end().to_owned()
})
.join("\n");