Fix member ordering bug (palantir#1252)

idriss92 · May 14, 2016 · dc439c4 · dc439c4
1 parent 70a8a1f
commit dc439c4
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 6 deletions.
diff --git a/src/language/walker/syntaxWalker.ts b/src/language/walker/syntaxWalker.ts
@@ -70,6 +70,10 @@ export class SyntaxWalker {
         this.walkChildren(node);
     }
 
+    protected visitClassExpression(node: ts.ClassExpression) {
+        this.walkChildren(node);
+    }
+
     protected visitCatchClause(node: ts.CatchClause) {
         this.walkChildren(node);
     }
@@ -352,6 +356,10 @@ export class SyntaxWalker {
                 this.visitClassDeclaration(<ts.ClassDeclaration> node);
                 break;
 
+            case ts.SyntaxKind.ClassExpression:
+                this.visitClassExpression(<ts.ClassExpression> node);
+                break;
+
             case ts.SyntaxKind.CatchClause:
                 this.visitCatchClause(<ts.CatchClause> node);
                 break;

diff --git a/src/rules/memberOrderingRule.ts b/src/rules/memberOrderingRule.ts
@@ -162,6 +162,7 @@ function getNodeOption({accessLevel, isConstructor, kind, membership}: INodeAndM
 export class MemberOrderingWalker extends Lint.RuleWalker {
     private previousMember: IModifiers;
     private memberStack: INodeAndModifiers[][] = [];
+    private hasOrderOption = this.getHasOrderOption();
 
     public visitClassDeclaration(node: ts.ClassDeclaration) {
         this.resetPreviousModifiers();
@@ -171,6 +172,14 @@ export class MemberOrderingWalker extends Lint.RuleWalker {
         this.checkMemberOrder();
     }
 
+    public visitClassExpression(node: ts.ClassExpression) {
+        this.resetPreviousModifiers();
+
+        this.newMemberList();
+        super.visitClassExpression(node);
+        this.checkMemberOrder();
+    }
+
     public visitInterfaceDeclaration(node: ts.InterfaceDeclaration) {
         this.resetPreviousModifiers();
 
@@ -265,16 +274,20 @@ export class MemberOrderingWalker extends Lint.RuleWalker {
 
     /* start new code */
     private newMemberList() {
-        this.memberStack.push([]);
+        if (this.hasOrderOption) {
+            this.memberStack.push([]);
+        }
     }
 
     private pushMember(node: INodeAndModifiers) {
-        this.memberStack[this.memberStack.length - 1].push(node);
+        if (this.hasOrderOption) {
+            this.memberStack[this.memberStack.length - 1].push(node);
+        }
     }
 
     private checkMemberOrder() {
-        const memberList = this.memberStack.pop();
-        if (this.hasOrderOption()) {
+        if (this.hasOrderOption) {
+            const memberList = this.memberStack.pop();
             const order = this.getOrder();
             const memberRank = memberList.map((n) => order.indexOf(getNodeOption(n)));
 
@@ -307,11 +320,10 @@ export class MemberOrderingWalker extends Lint.RuleWalker {
                     prevRank = rank;
                 }
             });
-
         }
     }
 
-    private hasOrderOption() {
+    private getHasOrderOption() {
         const allOptions = this.getOptions();
         if (allOptions == null || allOptions.length === 0) {
             return false;

diff --git a/test/rules/member-ordering/order/custom/test.ts.lint b/test/rules/member-ordering/order/custom/test.ts.lint
@@ -20,10 +20,17 @@ class AlsoOkay {
             someMethod() {}
         };
     }
+
     private z = 10;
 }
 
 const foo = {
     // TS treats this as a method, but we should be careful not to
     someMethod() {}
 };
+
+function makeAClass() {
+    const myClass = class {
+        method(){}
+    };
+}