Cargo fmt and update a test

[rust.git] / src / comment.rs

diff --git a/src/comment.rs b/src/comment.rs
index 2511e5df216a6015646e72d658a09bc24eff7131..8b8112618b4a8c948ae616846cd74cdc5c2a57b0 100644 (file)
--- a/src/comment.rs
+++ b/src/comment.rs
@@ -205,11 +205,7 @@ pub fn combine_strs_with_missing_comments(
     };
     Some(format!(
         "{}{}{}{}{}",
-        prev_str,
-        first_sep,
-        missing_comment,
-        second_sep,
-        next_str,
+        prev_str, first_sep, missing_comment, second_sep, next_str,
     ))
 }
 
@@ -224,9 +220,7 @@ pub fn rewrite_comment(
     // we should stop now.
     let num_bare_lines = orig.lines()
         .map(|line| line.trim())
-        .filter(|l| {
-            !(l.starts_with('*') || l.starts_with("//") || l.starts_with("/*"))
-        })
+        .filter(|l| !(l.starts_with('*') || l.starts_with("//") || l.starts_with("/*")))
         .count();
     if num_bare_lines > 0 && !config.normalize_comments() {
         return Some(orig.to_owned());
@@ -321,6 +315,7 @@ fn rewrite_comment_inner(
 
     let mut result = opener.to_owned();
     let mut is_prev_line_multi_line = false;
+    let mut inside_code_block = false;
     let comment_line_separator = format!("\n{}{}", indent_str, line_start);
     for line in lines {
         if result == opener {
@@ -333,6 +328,14 @@ fn rewrite_comment_inner(
             result.push_str(&comment_line_separator);
         }
 
+        if line.starts_with("```") {
+            inside_code_block = !inside_code_block;
+        }
+        if inside_code_block {
+            result.push_str(line);
+            continue;
+        }
+
         if config.wrap_comments() && line.len() > fmt.shape.width && !has_url(line) {
             match rewrite_string(line, &fmt, Some(max_chars)) {
                 Some(ref s) => {