Fix #2986 await-promise accept intersection (#2987)

palantir · Jul 7, 2017 · e22bf9e · e22bf9e
1 parent 37966e9
commit e22bf9e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/src/rules/awaitPromiseRule.ts b/src/rules/awaitPromiseRule.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { isAwaitExpression } from "tsutils";
+import { isAwaitExpression, isUnionOrIntersectionType } from "tsutils";
 import * as ts from "typescript";
 import * as Lint from "../index";
 
@@ -65,7 +65,7 @@ function walk(ctx: Lint.WalkContext<void>, tc: ts.TypeChecker, promiseTypes: Set
             return true;
         }
 
-        if (isUnionType(type)) {
+        if (isUnionOrIntersectionType(type)) {
             return type.types.some(couldBePromise);
         }
 
@@ -78,7 +78,3 @@ function walk(ctx: Lint.WalkContext<void>, tc: ts.TypeChecker, promiseTypes: Set
         return target !== undefined && target.symbol !== undefined && promiseTypes.has(target.symbol.name);
     }
 }
-
-function isUnionType(type: ts.Type): type is ts.UnionType {
-    return Lint.isTypeFlagSet(type, ts.TypeFlags.Union);
-}
diff --git a/test/rules/await-promise/custom-promise/test.ts.lint b/test/rules/await-promise/custom-promise/test.ts.lint
@@ -44,6 +44,10 @@ async function fStandardPromise() {
     await (Math.random() > 0.5 ? numberPromise : 0);
     await (Math.random() > 0.5 ? foo : 0);
     await (Math.random() > 0.5 ? bar : 0);
+
+    // intersection type
+    const intersectionPromise: Promise<number> & number;
+    await intersectionPromise;
 }
 
 async function fCustomPromise() {
@@ -65,6 +69,10 @@ async function fCustomPromise() {
     await (Math.random() > 0.5 ? numberPromise : 0);
     await (Math.random() > 0.5 ? foo : 0);
     await (Math.random() > 0.5 ? bar : 0);
+
+    // intersection type
+    const intersectionPromise: CustomPromise<number> & number;
+    await intersectionPromise;
 }
 
 [0]: 'await' of non-Promise.
diff --git a/test/rules/await-promise/es6-promise/test.ts.lint b/test/rules/await-promise/es6-promise/test.ts.lint
@@ -42,6 +42,10 @@ async function fPromise() {
     await (Math.random() > 0.5 ? numberPromise : 0);
     await (Math.random() > 0.5 ? foo : 0);
     await (Math.random() > 0.5 ? bar : 0);
+
+    // intersection type
+    const intersectionPromise: Promise<number> & number;
+    await intersectionPromise;
 }
 
 [0]: 'await' of non-Promise.