@putout/printer 6.8.2 → 6.9.0

package/ChangeLog

@@ -1,3 +1,8 @@
+2023.11.30, v6.9.0
+
+feature:
+- 672f353 @putout/printer: improve support of trailing comments on next line
+
 2023.11.30, v6.8.2
 
 feature:

package/lib/tokenize/comment/parse-trailing-comments.js

@@ -13,6 +13,23 @@ function isSameLine(path, loc) {
     return path.node.loc?.start.line === loc.start.line || path.node.loc?.end.line === loc.end.line;
 }
 
+const isTrailingIsLeading = (path) => path.node.trailingComments === path.getNextSibling().node?.leadingComments;
+
+function isCommentOnNextLine(path) {
+    const {
+        loc,
+        trailingComments,
+    } = path.node;
+    
+    if (isTrailingIsLeading(path))
+        return false;
+    
+    const [comment] = trailingComments;
+    const {line} = comment.loc.start;
+    
+    return line === loc.start.line + 1;
+}
+
 module.exports.parseTrailingComments = (path, {write, maybe}, semantics) => {
     if (!semantics.comments)
         return;
@@ -29,10 +46,12 @@ module.exports.parseTrailingComments = (path, {write, maybe}, semantics) => {
     
     for (const {type, value, loc} of trailingComments) {
         const sameLine = isSameLine(path, loc);
+        const commentOnNextLine = isCommentOnNextLine(path);
         
         if (type === 'CommentLine') {
+            maybe.write.breakline(commentOnNextLine);
             maybe.write.space(sameLine);
-            maybe.indent(!sameLine);
+            maybe.indent(!sameLine && !commentOnNextLine);
             
             if (hasBody(path)) {
                 maybe.write.breakline(!isNext(path));
@@ -53,3 +72,4 @@ module.exports.parseTrailingComments = (path, {write, maybe}, semantics) => {
         }
     }
 };
+

package/lib/tokenize/expressions/spread-element.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const {hasTrailingComment} = require('../is');
+
 module.exports.SpreadElement = (path, printer) => {
     const {print} = printer;
     print('...');

package/package.json

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