fixup

Author: Mesteery

docs/rules/prefer-t-throws.md

@@ -82,3 +82,15 @@ test('some test', async t => {
 	}
 });
 ```
+
+```js
+test('some test', async t => {
+	try {
+		myFunction();
+		return;
+		t.fail();
+	} catch (error) {
+		t.is(error.message, 'Unicorn overload');
+	}
+});
+```

rules/prefer-t-throws.js

@@ -6,7 +6,7 @@ const util = require('../util');
 
 function hasAwaitExpression(nodes) {
 	if (!nodes) {
-		return false
+		return false;
 	}
 
 	for (const node of nodes) {
@@ -24,10 +24,10 @@ function hasAwaitExpression(nodes) {
 
 		// Make the rule passes if a return statement is found.
 		if (node.type === 'ReturnStatement') {
+			// eslint-disable-next-line no-throw-literal
 			throw undefined;
 		}
 
-
 		if (node.expressions && hasAwaitExpression(node.expressions)) {
 			return true;
 		}
@@ -37,7 +37,7 @@ function hasAwaitExpression(nodes) {
 		}
 
 		if (node.type === 'MemberExpression' && hasAwaitExpression([node.object, node.property])) {
-			return true
+			return true;
 		}
 
 		if ((node.type === 'CallExpression' || node.type === 'NewExpression')
@@ -66,9 +66,9 @@ function hasAwaitExpression(nodes) {
 			return true;
 		}
 
-		if (node.type === 'SwitchStatement' && hasAwaitExpression([node.discriminant, ...node.cases.flatMap(caseNode => {
-			return [caseNode.test].concat(caseNode.consequent);
-		})])) {
+		if (node.type === 'SwitchStatement'
+				// eslint-disable-next-line unicorn/prefer-spread
+				&& hasAwaitExpression([node.discriminant, ...node.cases.flatMap(caseNode => [caseNode.test].concat(caseNode.consequent))])) {
 			return true;
 		}
 
@@ -109,14 +109,13 @@ const create = context => {
 				return;
 			}
 
-			const tFailIndex =  [...nodes].reverse().findIndex(node => {
-				return node.type === 'ExpressionStatement'
-					&& node.expression.type === 'CallExpression'
-					&& node.expression.callee.object
-					&& node.expression.callee.object.name === 't'
-					&& node.expression.callee.property
-					&& node.expression.callee.property.name === 'fail';
-			});
+			const tFailIndex = [...nodes].reverse().findIndex(node => node.type === 'ExpressionStatement'
+				&& node.expression.type === 'CallExpression'
+				&& node.expression.callee.object
+				&& node.expression.callee.object.name === 't'
+				&& node.expression.callee.property
+				&& node.expression.callee.property.name === 'fail');
+
 			// Return if there is no t.fail() or if it's the first node
 			if (tFailIndex === -1 || tFailIndex === nodes.length - 1) {
 				return;

test/prefer-t-throws.js

@@ -17,11 +17,12 @@ ruleTester.run('prefer-t-throws', rule, {
 		`${header}test(async t => { const error = await t.throwsAsync(promise); t.is(error, 'error'); });`,
 		`${header}test(t => { const error = t.throws(fn()); t.is(error, 'error'); });`,
 		`${header}test(async t => { try { t.fail(); unicorn(); } catch (error) { t.is(error, 'error'); } });`,
+		`${header}test(async t => { try { unicorn(); return; t.fail(); } catch (error) { t.is(error, 'error'); } });`,
 		`${header}test(async t => { try { await promise; } catch (error) { t.is(error, 'error'); } });`,
 	],
 	invalid: [
 		{
-			code: 		`${header}test(async t => { try { async function unicorn() { throw await Promise.resolve('error') }; unicorn(); t.fail(); } catch (error) { t.is(error, 'error'); } });`,
+			code: `${header}test(async t => { try { async function unicorn() { throw await Promise.resolve('error') }; unicorn(); t.fail(); } catch (error) { t.is(error, 'error'); } });`,
 			errors: [{message: 'Prefer using the `t.throws()` assertion.'}],
 		},
 		{