fixing rebase

Author: Janther

src/nodes/ContractDefinition.js

@@ -17,7 +17,7 @@ const inheritance = (node, path, print) =>
     : line;
 
 const body = (node, path, options, print) =>
-  node.subNodes.length > 0
+  node.subNodes.length > 0 || node.comments
     ? concat([
         indent(
           concat([

src/nodes/print-comments.js

@@ -1,33 +1,10 @@
 const {
   doc: {
-    builders: { concat, join, line }
+    builders: { join, line }
   }
 } = require('prettier');
 
-const printComments = (node, path, options) => {
-  const parts = [];
-  if (node.comments) {
-    let first = true;
-    path.each(commentPath => {
-      const comment = commentPath.getValue();
-      if (comment.trailing || comment.leading) {
-        return;
-      }
-
-      if (first) {
-        first = false;
-      } else {
-        parts.push(line);
-      }
-
-      comment.printed = true;
-      parts.push(options.printer.printComment(commentPath, options));
-    }, 'comments');
-  }
-  return concat(parts);
-};
-
-const printCommentsNew = (node, path, options) =>
+const printComments = (node, path, options) =>
   node.comments
     ? join(
         line,

tests/Comments/Comments.sol

@@ -22,7 +22,8 @@ contract Comments3 is Interface1, Interface2, Interface3, Interface4, Interface5
 
   function someFunction() {
 
-  }
+  }/*1*//*2
+  */
 }
 
 contract Comments4 is Interface1, Interface2, Interface3, Interface4, Interface5, Interface6 {

tests/Comments/__snapshots__/jsfmt.spec.js.snap

@@ -25,7 +25,8 @@ contract Comments3 is Interface1, Interface2, Interface3, Interface4, Interface5
 
   function someFunction() {
 
-  }
+  }/*1*//*2
+  */
 }
 
 contract Comments4 is Interface1, Interface2, Interface3, Interface4, Interface5, Interface6 {
@@ -56,6 +57,7 @@ contract Comments7 {
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 pragma solidity ^0.4.24;
 
+
 contract Comments1 {
     function() {
         // solhint-disable-previous-line no-empty-blocks
@@ -74,10 +76,12 @@ contract Comments1 {
     }
 }
 
+
 contract Comments2 {
     // solhint-disable-previous-line no-empty-blocks
 }
 
+
 contract Comments3 is
     Interface1,
     Interface2,
@@ -88,9 +92,12 @@ contract Comments3 is
 {
     // solhint-disable-previous-line no-empty-blocks
 
-    function someFunction() {}
+    function someFunction() {} /*1*/
+    /*2
+     */
 }
 
+
 contract Comments4 is
     Interface1,
     Interface2,
@@ -102,11 +109,13 @@ contract Comments4 is
     // solhint-disable-previous-line no-empty-blocks
 }
 
+
 /*nice name*/
 contract Comments5 {
     // solhint-disable-previous-line no-empty-blocks
 }
 
+
 /*why the name \`Comments6\`*/
 contract Comments6 is
     Interface1, /*why we used Interface1*/
@@ -119,6 +128,7 @@ contract Comments6 is
     // solhint-disable-previous-line no-empty-blocks
 }
 
+
 contract Comments7 {
     function someFunction(
         uint256 a, // the first value