fix(rules): support .then() in ion-overlay-method-*-should-use-await …

…rule (#62)
ionic-team · Oct 9, 2018 · 7318565 · 7318565
1 parent 126b4f3
commit 7318565
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 5 deletions.
diff --git a/src/ionOverlayMethodCreateShouldUseAwaitRule.ts b/src/ionOverlayMethodCreateShouldUseAwaitRule.ts
@@ -17,12 +17,17 @@ const matchingControllers = [
 
 class CreateMethodShouldUseAwaitWalker extends Lint.RuleWalker {
   visitCallExpression(node: ts.CallExpression) {
-    debugger;
     if (node.arguments.length > 0) {
       const firstArgument = node.arguments[0];
 
       if (isValidForRule(node, 'create', ...matchingControllers) && tsutils.isObjectLiteralExpression(firstArgument)) {
-        if (node.parent.kind !== ts.SyntaxKind.AwaitExpression) {
+        if (
+          !tsutils.isAwaitExpression(node.parent) &&
+          (!tsutils.isPropertyAccessExpression(node.parent) ||
+            !tsutils.isCallExpression(node.parent.parent) ||
+            !tsutils.isPropertyAccessExpression(node.parent.parent.expression) ||
+            node.parent.parent.expression.name.text !== 'then')
+        ) {
           this.addFailureAtNode(node, ruleMessage);
         }
       }

diff --git a/src/ionOverlayMethodPresentShouldUseAwaitRule.ts b/src/ionOverlayMethodPresentShouldUseAwaitRule.ts
@@ -16,12 +16,16 @@ const matchingControllers = [
 
 class CreateMethodShouldUseAwaitWalker extends Lint.RuleWalker {
   visitCallExpression(node: ts.CallExpression) {
-    debugger;
-
     let expression = node.expression;
 
     if (tsutils.isPropertyAccessExpression(expression) && expression.name.text === 'present') {
-      if (node.parent.kind !== ts.SyntaxKind.AwaitExpression) {
+      if (
+        !tsutils.isAwaitExpression(node.parent) &&
+        (!tsutils.isPropertyAccessExpression(node.parent) ||
+          !tsutils.isCallExpression(node.parent.parent) ||
+          !tsutils.isPropertyAccessExpression(node.parent.parent.expression) ||
+          node.parent.parent.expression.name.text !== 'then')
+      ) {
         this.addFailureAtNode(node, ruleMessage);
       }
     }

diff --git a/test/ionOverlayMethodCreateShouldUseAwaitRule.spec.ts b/test/ionOverlayMethodCreateShouldUseAwaitRule.spec.ts
@@ -20,6 +20,23 @@ describe(ruleName, () => {
       assertSuccess(ruleName, source);
     });
 
+    it('should work when then() is used', () => {
+      let source = `
+      class DoSomething{
+        constructor(private actionSheetController: ActionSheetController){}
+        
+        doWork(){
+          this.actionSheetController.create({
+            component: PopoverComponent,
+            ev: event,
+            translucent: true
+          }).then(() => {});
+        }
+      }
+        `;
+      assertSuccess(ruleName, source);
+    });
+
     it('should work when the controller variable is named something else', () => {
       let source = `
       class DoSomething{

diff --git a/test/ionOverlayMethodPresentShouldUseAwaitRule.spec.ts b/test/ionOverlayMethodPresentShouldUseAwaitRule.spec.ts
@@ -21,6 +21,23 @@ describe(ruleName, () => {
         `;
       assertSuccess(ruleName, source);
     });
+
+    it('should work when then() is used', () => {
+      let source = `
+      class DoSomething{
+        constructor(private actionSheetController: ActionSheetController){}
+        
+        doWork(){
+          this.actionSheetController.create({
+            component: PopoverComponent,
+            ev: event,
+            translucent: true
+          }).then(() => {});
+        }
+      }
+        `;
+      assertSuccess(ruleName, source);
+    });
   });
 
   describe('failure', () => {