@putout/printer 1.40.0 → 1.40.2

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.04.13, v1.40.2
+
+feature:
+- 6d8d812 @putout/printer: comments: newline after CommentLine
+
+2023.04.13, v1.40.1
+
+fix:
+- e868511 @putout/printer: drop newline after BlockStatement when parentPath is IfStatement and current path not alternate
+
 2023.04.13, v1.40.0
 
 feature:

package/lib/tokenize/comments.js

@@ -45,7 +45,7 @@ module.exports.parseLeadingComments = (path, {print, maybe}) => {
     }
 };
 
-module.exports.parseTrailingComments = (path, {print}) => {
+module.exports.parseTrailingComments = (path, {write, maybe}) => {
     const {trailingComments} = path.node;
     
     if (!trailingComments || !trailingComments.length)
@@ -54,10 +54,13 @@ module.exports.parseTrailingComments = (path, {print}) => {
     if (isNext(path))
         return;
     
-    for (const {type, value} of trailingComments) {
+    for (const {type, value, loc} of trailingComments) {
         if (type === 'CommentLine') {
-            print.space();
-            print(`//${value}`);
+            const sameLine = isSameLine(path, loc);
+            maybe.write.space(sameLine);
+            maybe.indent(!sameLine);
+            write(`//${value}`);
+            maybe.write.newline(!sameLine);
             
             continue;
         }
@@ -67,3 +70,7 @@ module.exports.parseTrailingComments = (path, {print}) => {
 function shouldAddNewlineBefore(path) {
     return path.isStatement() && !isFirst(path) && !hasPrevNewline(path);
 }
+
+function isSameLine(path, loc) {
+    return path.node.loc.start.line === loc.start.line;
+}

package/lib/tokenize/statements/block-statement.js

@@ -4,6 +4,7 @@ const {
     isNext,
     isParentProgram,
     isLast,
+    exists,
 } = require('../is');
 
 const isFirstStatement = (path) => path.get('body.0')?.isStatement();
@@ -56,9 +57,26 @@ function shouldAddNewlineAfter(path) {
     if (isLast(path))
         return false;
     
+    if (isNextIfAlternate(path))
+        return false;
+    
     return true;
 }
 
+function isNextIfAlternate(path) {
+    const {parentPath} = path;
+    
+    if (!parentPath.isIfStatement())
+        return false;
+    
+    const alternate = parentPath.get('alternate');
+    
+    if (path === alternate)
+        return false;
+    
+    return exists(alternate);
+}
+
 function isTry({parentPath}) {
     if (parentPath.isTryStatement())
         return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "1.40.0",
+  "version": "1.40.2",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Easiest possible opinionated Babel AST printer made with ❤️  to use in 🐊Putout",