feature: @putout/printer: AssignmentExpression inside ExpressionStatement: comments

Author: coderaiser

lib/tokenize/statements/expression-statement/comments.spec.js

@@ -12,6 +12,11 @@ test('printer: tokenizer: statement: expression: comment: same line', (t) => {
     t.end();
 });
 
+test('printer: tokenizer: statement: expression: comment: line: assign', (t) => {
+    t.print(fixture.expressionCommentLineAssign);
+    t.end();
+});
+
 test('printer: tokenizer: statement: expression: inside arrow: leading comment', (t) => {
     t.print(fixture.expressionInsideArrowLeadingComment);
     t.end();

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

@@ -40,7 +40,23 @@ const isIndent = createTypeChecker([
     isNextToAssignmentCall,
 ]);
 
+function isSameLine(path) {
+    const {node} = path;
+    const [first] = path.node.trailingComments;
+    
+    if (!node.loc)
+        return false;
+    
+    return node.loc.start.line === first.loc.start.line;
+}
+
+const isCommentOnTheSameLine = createTypeChecker([
+    ['-: -> !', hasTrailingComment],
+    ['+', isSameLine],
+]);
+
 export const isIndentAfter = createTypeChecker([
+    ['-', isCommentOnTheSameLine],
     ['-: node.expression -> !AssignmentExpression'],
     ['+', callWithNext(hasLeadingComment)],
 ]);
@@ -81,3 +97,4 @@ export const ExpressionStatement = {
 export const isNewlineAfter = createTypeChecker([
     ['+: -> !', hasTrailingComment],
 ]);
+

lib/tokenize/statements/expression-statement/fixture/expression-comment-line-assign.js

@@ -0,0 +1,13 @@
+function printf() {
+    if ([line] === 24) {
+        [--line];
+        
+        ax = 0x601; // Прокрутка вверх на одну строку
+        bh = 0x02; // чорный фон, зеленые символы
+        cx ^= cx; // от 00:00
+        dx = 0x184f; // 24:79 (весь экран)
+        int(0x10);
+    }
+    
+    eax = 1;
+}