Fix #4579: false positive static-this in HOC (#4580)

palantir · Mar 16, 2019 · 66639f5 · 66639f5
1 parent cb15e5c
commit 66639f5
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 5 deletions.
diff --git a/src/rules/staticThisRule.ts b/src/rules/staticThisRule.ts
@@ -58,13 +58,17 @@ function walk(ctx: Lint.WalkContext<void>) {
     const cb = (node: ts.Node): void => {
         const originalParentClass = currentParentClass;
 
-        if (
-            utils.isClassLikeDeclaration(node.parent) &&
-            utils.hasModifier(node.modifiers, ts.SyntaxKind.StaticKeyword)
-        ) {
-            currentParentClass = node.parent;
+        if (utils.isClassLikeDeclaration(node.parent)) {
+            currentParentClass = undefined;
+
+            if (utils.hasModifier(node.modifiers, ts.SyntaxKind.StaticKeyword)) {
+                currentParentClass = node.parent;
+            }
+
             ts.forEachChild(node, cb);
             currentParentClass = originalParentClass;
+
+            return;
         }
 
         if (node.kind === ts.SyntaxKind.ThisKeyword && currentParentClass !== undefined) {

diff --git a/test/rules/static-this/test.ts.fix b/test/rules/static-this/test.ts.fix
@@ -63,3 +63,15 @@ class NamedClassChild extends NamedClass {
         return NamedClassChild;
     }
 }
+
+interface Bar {}
+
+class Foo {
+    public static higherOrderComponent(): any {
+        return class implements Bar {
+            public constructor() {
+                console.log(this);
+            }
+        };
+    }
+}
diff --git a/test/rules/static-this/test.ts.lint b/test/rules/static-this/test.ts.lint
@@ -73,3 +73,15 @@ class NamedClassChild extends NamedClass {
                ~~~~ [Use the parent class name instead of `this` when in a `static` context.]
     }
 }
+
+interface Bar {}
+
+class Foo {
+    public static higherOrderComponent(): any {
+        return class implements Bar {
+            public constructor() {
+                console.log(this);
+            }
+        };
+    }
+}