fix(eslint-plugin): [return-await] allow Any and Unknown (#1270)

typescript-eslint · Nov 27, 2019 · ebf5e0a · ebf5e0a
1 parent e9d44f5
commit ebf5e0a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/packages/eslint-plugin/src/rules/return-await.ts b/packages/eslint-plugin/src/rules/return-await.ts
@@ -68,11 +68,7 @@ export default util.createRule({
       }
 
       const type = checker.getTypeAtLocation(child);
-
-      const isThenable =
-        tsutils.isTypeFlagSet(type, ts.TypeFlags.Any) ||
-        tsutils.isTypeFlagSet(type, ts.TypeFlags.Unknown) ||
-        tsutils.isThenableType(checker, expression, type);
+      const isThenable = tsutils.isThenableType(checker, expression, type);
 
       if (!isAwait && !isThenable) {
         return;

diff --git a/packages/eslint-plugin/tests/rules/return-await.test.ts b/packages/eslint-plugin/tests/rules/return-await.test.ts
@@ -148,6 +148,16 @@ ruleTester.run('return-await', rule, {
         }
       }`,
     },
+    {
+      code: `async function test(): Promise<string> {
+        const res = await Promise.resolve('{}');
+        try {
+          return JSON.parse(res);
+        } catch (error) {
+          return res;
+        }
+      }`,
+    },
   ],
   invalid: [
     {