Merge pull request #3318 from rchaser53/issue-3314

fix Removed indentation after nested comments error
rust-lang · Feb 5, 2019 · aec0a7c · aec0a7c
2 parents 81067b1 + 5fcb750
commit aec0a7c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/src/comment.rs b/src/comment.rs
@@ -321,6 +321,7 @@ fn identify_comment(
         // for a block comment, search for the closing symbol
         CommentStyle::DoubleBullet | CommentStyle::SingleBullet | CommentStyle::Exclamation => {
             let closer = style.closer().trim_start();
+            let mut count = orig.matches(closer).count();
             let mut closing_symbol_offset = 0;
             let mut hbl = false;
             let mut first = true;
@@ -341,7 +342,10 @@ fn identify_comment(
                     first = false;
                 }
                 if trimmed_line.ends_with(closer) {
-                    break;
+                    count -= 1;
+                    if count == 0 {
+                        break;
+                    }
                 }
             }
             (hbl, closing_symbol_offset)

diff --git a/tests/source/issue-3314.rs b/tests/source/issue-3314.rs
@@ -0,0 +1,5 @@
+/*code
+/*code*/
+if true {
+    println!("1");
+}*/
diff --git a/tests/target/issue-3314.rs b/tests/target/issue-3314.rs
@@ -0,0 +1,5 @@
+/*code
+/*code*/
+if true {
+    println!("1");
+}*/