@putout/printer 1.75.0 → 1.76.0

package/ChangeLog

@@ -1,3 +1,8 @@
+2023.04.28, v1.76.0
+
+feature:
+- a515fbc @putout/printer: improve support of newlines in with comments
+
 2023.04.27, v1.75.0
 
 feature:

package/lib/tokenize/expressions/call-expression.js

@@ -31,8 +31,7 @@ function CallExpression(path, {indent, print, maybe, traverse}) {
         const isObject = arg.isObjectExpression();
         
         if (isParentCall && !isObject && n) {
-            print.newline();
-            indent();
+            print.breakline();
         }
         
         print(arg);

package/lib/tokenize/expressions/class.js

@@ -31,7 +31,9 @@ function classVisitor(path, {print, indent, maybe}) {
     
     if (node.implements) {
         print(' implements ');
-        path.get('implements').forEach(print);
+        path
+            .get('implements')
+            .forEach(print);
     }
     
     if (node.superClass) {

package/lib/tokenize/expressions/object-expression.js

@@ -7,7 +7,8 @@ const {
     noTrailingComment,
     isNewlineBetweenSiblings,
     noLeadingComment,
-    noComment,
+    hasLeadingComment,
+    exists,
 } = require('../is');
 
 const {isFunction} = require('@babel/types');
@@ -52,8 +53,11 @@ module.exports.ObjectExpression = (path, {print, maybe, indent}) => {
         }
         
         print(property);
-        maybe.print.newline(manyLines && noTrailingComment(property) && noComment(property));
-        maybe.print.linebreak(isNewlineBetweenSiblings(property));
+        
+        if (!hasNextLeadingComment(property)) {
+            maybe.print.newline(manyLines && noTrailingComment(property));
+            maybe.print.linebreak(isNewlineBetweenSiblings(property));
+        }
     }
     
     indent.dec();
@@ -63,6 +67,15 @@ module.exports.ObjectExpression = (path, {print, maybe, indent}) => {
     maybe.print(parens, ')');
 };
 
+const hasNextLeadingComment = (path) => {
+    const next = path.getNextSibling();
+    
+    if (!exists(next))
+        return false;
+    
+    return hasLeadingComment(next);
+};
+
 function shouldAddNewline(path) {
     if (!path.parentPath.isLogicalExpression())
         return false;

package/lib/tokenize/is.js

@@ -85,7 +85,7 @@ module.exports.satisfy = (conditions) => (path) => {
 };
 
 module.exports.hasTrailingComment = (path) => path.node?.trailingComments?.length;
+module.exports.hasLeadingComment = (path) => path.node?.leadingComments?.length;
 
 module.exports.noTrailingComment = (path) => !path.node.trailingComments?.length;
-module.exports.noComment = (path) => !path.node.comments?.length;
 module.exports.noLeadingComment = (path) => !path.node.leadingComments?.length;

package/lib/tokenize/jsx/jsx-text.js

@@ -9,16 +9,14 @@ module.exports.JSXText = (path, {write, indent}) => {
     
     if (isSpacesOnly && hasNext) {
         indent.inc();
-        write.newline();
-        write.indent();
+        write.breakline();
         indent.dec();
         
         return;
     }
     
     if (isSpacesOnly) {
-        write.newline();
-        write.indent();
+        write.breakline();
         
         return;
     }

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

@@ -9,15 +9,30 @@ const {
     satisfy,
     noTrailingComment,
     hasTrailingComment,
+    exists,
 } = require('../is');
 
+const satisfyAfter = satisfy([
+    isParentBlockOrNotLastOrParentLast,
+    isParentBlock,
+    isNext,
+    isNextUp,
+]);
+
 const isNextLiteral = (path) => {
     const next = path.getNextSibling();
+    
+    if (!exists(next))
+        return false;
+    
     const expression = next.get('expression');
     
     if (expression.isTemplateLiteral())
         return true;
     
+    if (expression.isArrayExpression())
+        return true;
+    
     return expression.isLiteral();
 };
 
@@ -39,15 +54,22 @@ module.exports.ExpressionStatement = {
             store(true);
         }
     },
-    afterSatisfy: () => [
-        isParentBlockOrNotLastOrParentLast,
-        isParentBlock,
-        isNext,
-        isNextUp,
-    ],
-    after(path, {print, maybe, store}) {
+    afterIf: (path) => {
         if (hasTrailingComment(path) && isNextLiteral(path))
-            return;
+            return false;
+        
+        if (satisfyAfter(path))
+            return true;
+        
+        if (hasTrailingComment(path) && isLast(path))
+            return true;
+        
+        return false;
+    },
+    after(path, {print, maybe, store}) {
+        if (hasTrailingComment(path) && isLast(path)) {
+            print.breakline();
+        }
         
         print.newline();
         maybe.markAfter(store(), path);

package/lib/tokenize/statements/for-in-statement.js

@@ -8,7 +8,9 @@ module.exports.ForInStatement = (path, {print}) => {
     print('__right');
     print(')');
     
-    if (path.get('body').isBlockStatement())
+    if (path
+        .get('body')
+        .isBlockStatement())
         print.space();
     
     print('__body');

package/lib/tokenize/statements/import-declaration.js

@@ -64,7 +64,9 @@ module.exports.ImportDeclaration = {
         if (isLast(path))
             return false;
         
-        if (path.getNextSibling().isImportDeclaration())
+        if (path
+            .getNextSibling()
+            .isImportDeclaration())
             return false;
         
         return true;

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

@@ -20,7 +20,9 @@ module.exports.SwitchStatement = {
             print(switchCase.get('test'));
             print(':');
             
-            const isBlock = switchCase.get('consequent.0').isBlockStatement();
+            const isBlock = switchCase
+                .get('consequent.0')
+                .isBlockStatement();
             
             maybe.indent.inc(!isBlock);
             maybe.print.newline(!isBlock);

package/lib/tokenize/statements/variable-declaration.js

@@ -125,5 +125,7 @@ const isNextAssign = (path) => {
     if (parentPath.isBlockStatement() && parentPath.node.body.length < 3)
         return false;
     
-    return nextPath.get('expression').isAssignmentExpression();
+    return nextPath
+        .get('expression')
+        .isAssignmentExpression();
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "1.75.0",
+  "version": "1.76.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer fro 🐊Putout",