no-invalid-this: stylistic cleanup

palantir · Nov 7, 2018 · cad840a · cad840a
1 parent 65e2dfd
commit cad840a
Showing 1 changed file with 10 additions and 13 deletions.
diff --git a/src/rules/noInvalidThisRule.ts b/src/rules/noInvalidThisRule.ts
@@ -57,21 +57,18 @@ export class Rule extends Lint.Rules.AbstractRule {
     }
 }
 
+const enum parentType {
+    None,
+    Class,
+    ClassMethod,
+    BoundRegularFunction,
+    UnboundRegularFunction,
+}
+const thisAllowedParents = new Set([parentType.ClassMethod, parentType.BoundRegularFunction]);
+
 function walk(ctx: Lint.WalkContext<boolean>): void {
     const { sourceFile, options: checkFuncInMethod } = ctx;
 
-    const enum parentType {
-        None,
-        Class,
-        ClassMethod,
-        BoundRegularFunction,
-        UnboundRegularFunction,
-    }
-
-    function thisIsAllowed(parent: parentType): boolean {
-        return [parentType.ClassMethod, parentType.BoundRegularFunction]
-            .some((t) => parent === t);
-    }
     let currentParent: parentType = parentType.None;
     let inClass = false;
 
@@ -111,7 +108,7 @@ function walk(ctx: Lint.WalkContext<boolean>): void {
                 }
 
             case ts.SyntaxKind.ThisKeyword:
-                if (!thisIsAllowed(currentParent)) {
+                if (!thisAllowedParents.has(currentParent)) {
                     if (!inClass) {
                         ctx.addFailureAtNode(node, Rule.FAILURE_STRING_OUTSIDE);
                     } else if (checkFuncInMethod) {