feature: comments: leading: improve

putoutjs · Oct 25, 2023 · dbd6b5c · dbd6b5c
1 parent 0906cf3
commit dbd6b5c
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/lib/tokenize/comment/comment.spec.js b/lib/tokenize/comment/comment.spec.js
@@ -40,6 +40,11 @@ test('printer: comment: line', (t) => {
     t.end();
 });
 
+test('printer: comment: line: after block', (t) => {
+    t.print(fixture.commentLineAfterBlock);
+    t.end();
+});
+
 test('printer: comment: line: innerComments', (t) => {
     const ast = parse(fixture.commentLine, {
         printer: 'putout',

diff --git a/lib/tokenize/comment/fixture/comment-line-after-block.js b/lib/tokenize/comment/fixture/comment-line-after-block.js
@@ -0,0 +1,10 @@
+const initialValue = 0;
+
+{
+    for (const currentValue of array1) {}
+}
+
+// .reduceRight();
+{
+    for (const a of x.slice(1)) {}
+}
diff --git a/lib/tokenize/comment/parse-leading-comments.js b/lib/tokenize/comment/parse-leading-comments.js
@@ -66,7 +66,6 @@ module.exports.parseLeadingComments = (path, {print, maybe, indent}, semantics)
             const looksLikeDirective = path.isDirective();
             const looksLikeProp = path.isObjectProperty();
 
-            // || path.isTSPropertySignature();
             if (looksLikeProp)
                 print.breakline();
 

diff --git a/lib/tokenize/comment/parse-trailing-comments.js b/lib/tokenize/comment/parse-trailing-comments.js
@@ -1,7 +1,11 @@
 'use strict';
 
 const {isDecorator} = require('@putout/babel').types;
-const {isLast, isCoupleLines} = require('../is');
+const {
+    isLast,
+    isCoupleLines,
+    isNext,
+} = require('../is');
 
 const hasBody = (path) => path.node.body;
 
@@ -30,7 +34,7 @@ module.exports.parseTrailingComments = (path, {write, maybe}, semantics) => {
 
             if (hasBody(path)) {
                 write.breakline();
-                write.breakline();
+                maybe.write.breakline(!isNext(path));
             }
 
             write(`//${value}`);