From d65dc40348afc90c812b4d392f8e085eca78fc17 Mon Sep 17 00:00:00 2001 From: kjeremy Date: Wed, 31 Jul 2019 11:43:00 -0400 Subject: Removes `*/` in block doc comments --- crates/ra_syntax/src/ast.rs | 49 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) (limited to 'crates/ra_syntax/src/ast.rs') diff --git a/crates/ra_syntax/src/ast.rs b/crates/ra_syntax/src/ast.rs index c5746d98d..8ac313e6e 100644 --- a/crates/ra_syntax/src/ast.rs +++ b/crates/ra_syntax/src/ast.rs @@ -138,6 +138,55 @@ fn test_doc_comment_preserves_newlines() { assert_eq!("this\nis\nmod\nfoo", module.doc_comment_text().unwrap()); } +#[test] +fn test_doc_comment_single_line_block_strips_suffix() { + let file = SourceFile::parse( + r#" + /** this is mod foo*/ + mod foo {} + "#, + ) + .ok() + .unwrap(); + let module = file.syntax().descendants().find_map(Module::cast).unwrap(); + assert_eq!("this is mod foo", module.doc_comment_text().unwrap()); +} + +#[test] +fn test_doc_comment_single_line_block_strips_suffix_whitespace() { + let file = SourceFile::parse( + r#" + /** this is mod foo */ + mod foo {} + "#, + ) + .ok() + .unwrap(); + let module = file.syntax().descendants().find_map(Module::cast).unwrap(); + assert_eq!("this is mod foo", module.doc_comment_text().unwrap()); +} + +#[test] +fn test_doc_comment_multi_line_block_strips_suffix() { + let file = SourceFile::parse( + r#" + /** + this + is + mod foo + */ + 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() + ); +} + #[test] fn test_where_predicates() { fn assert_bound(text: &str, bound: Option) { -- cgit v1.2.3 From 0f61aa1f09f0609271d3c0a3d23815488ec94949 Mon Sep 17 00:00:00 2001 From: kjeremy Date: Wed, 31 Jul 2019 13:59:14 -0400 Subject: Unconditionally trim the end of comments --- crates/ra_syntax/src/ast.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'crates/ra_syntax/src/ast.rs') diff --git a/crates/ra_syntax/src/ast.rs b/crates/ra_syntax/src/ast.rs index 8ac313e6e..6f0489617 100644 --- a/crates/ra_syntax/src/ast.rs +++ b/crates/ra_syntax/src/ast.rs @@ -181,10 +181,7 @@ fn test_doc_comment_multi_line_block_strips_suffix() { .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] -- cgit v1.2.3