eslint-plugin-putout 12.0.1 → 12.0.2

package/lib/add-newline-before-function-call/index.js

@@ -13,7 +13,7 @@ const regExp = /^\n( +)?\n +$/;
 module.exports.category = 'typescript';
 module.exports.report = () => 'Add newline before function call';
 
-module.exports.filter = ({text, node, getText, getCommentsBefore}) => {
+module.exports.filter = ({text, node, getCommentsBefore, getSpacesBeforeNode}) => {
     if (!isExpressionStatement(node.parent))
         return false;
     
@@ -31,7 +31,7 @@ module.exports.filter = ({text, node, getText, getCommentsBefore}) => {
     if (n < 3)
         return false;
     
-    const spaces = getSpacesBeforeNode(node, {text, getText});
+    const spaces = getSpacesBeforeNode(node, text);
     
     if (regExp.test(spaces))
         return false;
@@ -48,7 +48,7 @@ module.exports.filter = ({text, node, getText, getCommentsBefore}) => {
         if (!isVariableDeclaration(prevA))
             return false;
         
-        const spaces = getSpacesBeforeNode(prevA, {getText});
+        const spaces = getSpacesBeforeNode(prevA);
         
         if (regExp.test(spaces))
             return false;
@@ -56,7 +56,7 @@ module.exports.filter = ({text, node, getText, getCommentsBefore}) => {
         if (!nextA)
             return true;
         
-        const nextSpaces = getSpacesBeforeNode(nextA, {getText});
+        const nextSpaces = getSpacesBeforeNode(nextA);
         return !regExp.test(nextSpaces);
     }
     
@@ -71,13 +71,3 @@ module.exports.include = () => [
     'CallExpression',
 ];
 
-function getSpacesBeforeNode(node, {getText, text = getText(node)}) {
-    let spaces = '';
-    let i = 0;
-    
-    while (!spaces || /^[ \n]+$/.test(spaces))
-        spaces = getText(node, ++i)
-            .replace(text, '');
-    
-    return spaces.slice(1);
-}

package/lib/tape-remove-newline-before-t-end/index.js

@@ -1,16 +1,45 @@
 'use strict';
 
+const {
+    operator,
+    types,
+} = require('putout');
+
+const {
+    isCallExpression,
+    isIdentifier,
+} = types;
+
+const {compare} = operator;
+
 module.exports.category = 'tape';
 module.exports.report = () => 'Remove newline before t.end()';
 
 const newlineReg = /\n( +)?\n +t.end\(\)/;
 
-module.exports.filter = ({text}) => {
+module.exports.filter = ({text, node}) => {
     if (!/^test(\.only|\.skip)?\(/.test(text))
         return false;
     
-    if (newlineReg.test(text))
-        return true;
+    if (!newlineReg.test(text))
+        return false;
+    
+    const {body} = node.arguments[1].body;
+    const n = body.length;
+    
+    for (let i = 1; i < n; i++) {
+        const current = body[i];
+        const prev = body[i - 1];
+        
+        if (!compare(current, 't.end()'))
+            continue;
+        
+        if (!isCallExpression(prev.expression))
+            break;
+        
+        const {callee} = prev.expression;
+        return isIdentifier(callee.object, {name: 't'});
+    }
     
     return false;
 };

package/lib/wrap.js

@@ -8,6 +8,9 @@ const prepare = (plugin, context, options) => (node) => {
     const getText = source.getText.bind(source);
     const getCommentsBefore = source.getCommentsBefore.bind(source);
     const getCommentsAfter = source.getCommentsAfter.bind(source);
+    const getSpacesBeforeNode = createGetSpacesBeforeNode({
+        getText,
+    });
     
     const text = getText(node);
     
@@ -18,6 +21,7 @@ const prepare = (plugin, context, options) => (node) => {
         getText,
         getCommentsBefore,
         getCommentsAfter,
+        getSpacesBeforeNode,
         filename,
     });
     
@@ -91,3 +95,14 @@ function getTraversers(names, plugin) {
     return traversers;
 }
 
+const createGetSpacesBeforeNode = ({getText}) => (node, text = getText(node)) => {
+    let spaces = '';
+    let i = 0;
+    
+    while (!spaces || /^[ \n]+$/.test(spaces))
+        spaces = getText(node, ++i)
+            .replace(text, '');
+    
+    return spaces.slice(1);
+};
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-putout",
-  "version": "12.0.1",
+  "version": "12.0.2",
   "description": "eslint plugin for putout",
   "release": false,
   "tag": false,