]> git.lizzy.rs Git - rust.git/commitdiff
Do not combine short parent and comment
authorSeiichi Uchida <seuchida@gmail.com>
Sun, 5 Aug 2018 05:28:20 +0000 (14:28 +0900)
committerSeiichi Uchida <seuchida@gmail.com>
Sun, 5 Aug 2018 05:28:20 +0000 (14:28 +0900)
src/chains.rs

index daff789296e432ca9b9ae684c5c26ff6aed08149..a6bffd8f2fbd3f2d2342c231fb2043f270e186d2 100644 (file)
@@ -575,6 +575,9 @@ fn format_root(
 
         while root_rewrite.len() <= tab_width && !root_rewrite.contains('\n') {
             let item = &self.shared.children[0];
+            if let ChainItemKind::Comment = item.kind {
+                break;
+            }
             let shape = shape.offset_left(root_rewrite.len())?;
             match &item.rewrite(context, shape) {
                 Some(rewrite) => root_rewrite.push_str(rewrite),
@@ -667,6 +670,10 @@ fn format_root(
 
         if !multiline || parent.kind.is_block_like(context, &root_rewrite) {
             let item = &self.shared.children[0];
+            if let ChainItemKind::Comment = item.kind {
+                self.shared.rewrites.push(root_rewrite);
+                return Some(());
+            }
             let child_shape = parent_shape
                 .visual_indent(self.offset)
                 .sub_width(self.offset)?;