refactor

Author: Janther

src/comments/handlers/ContractDefinition.js

@@ -26,23 +26,21 @@ function handleContractDefinitionComments(
     options.locEnd
   );
 
-  // In this scenario we are in between jus after a base contract declaration.
-  if (precedingNode && precedingNode.type === 'InheritanceSpecifier') {
-    if (
-      (followingNode && followingNode.type === 'InheritanceSpecifier') ||
-      nextCharacter === '{'
-    ) {
-      addTrailingComment(precedingNode, comment);
-      return true;
-    }
-  }
-
-  // In this scenario we have a comment just after the contract's name
-  // TODO: at the moment we prepended it but this should be kept after the name.
+  // The comment is behind the start of the Block `{}` or behind a base contract
   if (
     (followingNode && followingNode.type === 'InheritanceSpecifier') ||
     nextCharacter === '{'
   ) {
+    // In this scenario the comment belongs to a base contract.
+    //   contract A is B, /* comment for B */ C /* comment for C */ {}
+    if (precedingNode && precedingNode.type === 'InheritanceSpecifier') {
+      addTrailingComment(precedingNode, comment);
+      return true;
+    }
+
+    // In this scenario the comment belongs to the contract's name.
+    //   contract A /* comment for A */ is B, C {}
+    // TODO: at the moment we prepended it but this should be kept after the name.
     addLeadingComment(enclosingNode, comment);
     return true;
   }

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

@@ -121,9 +121,9 @@ contract Comments6 is
 
 contract Comments7 {
     function someFunction(
-        uint a, // the first value
-        uint b, // the second value
-        uint c // the lats value
+        uint256 a, // the first value
+        uint256 b, // the second value
+        uint256 c // the lats value
     ) {
         someFunction(
             a, // the first value