Revert recent member-ordering changes (palantir#2118)

* Revert "member-ordering: Support categories (palantir#2041)" This reverts commit 18e7604. * Revert "Rewrite member-ordering rule (palantir#1957)" This reverts commit e6ca414.
andy-hanson · Jan 25, 2017 · aaa2319 · aaa2319
1 parent f53ec35
commit aaa2319
Show file tree

Hide file tree

Showing 21 changed files with 274 additions and 407 deletions.
diff --git a/src/rules/memberOrderingRule.ts b/src/rules/memberOrderingRule.ts
diff --git a/test/rules/member-ordering/custom-categories/test.ts.lint b/test/rules/member-ordering/custom-categories/test.ts.lint
diff --git a/test/rules/member-ordering/custom-categories/tslint.json b/test/rules/member-ordering/custom-categories/tslint.json
diff --git a/...g/variables-before-functions/test.ts.lint → ...rules/member-ordering/method/test.ts.lint b/...g/variables-before-functions/test.ts.lint → ...rules/member-ordering/method/test.ts.lint
@@ -52,20 +52,5 @@ class Constructor2 {
     ~~~~~~~~~~~~~~~~~ [0]
 }
 
-// Works for type literal, just like interface
-type T = {
-    x(): void;
-    y: number;
-    ~~~~~~~~~~ [0]
-}
-
-// Works for class inside object literal
-const o = {
-    foo: class C {
-        x(): void;
-        y: number;
-        ~~~~~~~~~~ [0]
-    }
-}
+[0]: Declaration of public instance member variable not allowed to appear after declaration of public instance member function
 
-[0]: Declaration of field not allowed after declaration of method. Instead, this should come at the beginning of the class/interface.
diff --git a/...ng/variables-before-functions/tslint.json → .../rules/member-ordering/method/tslint.json b/...ng/variables-before-functions/tslint.json → .../rules/member-ordering/method/tslint.json
diff --git a/test/rules/member-ordering/omit-access-modifier/test.ts.lint b/test/rules/member-ordering/omit-access-modifier/test.ts.lint
diff --git a/test/rules/member-ordering/omit-access-modifier/tslint.json b/test/rules/member-ordering/omit-access-modifier/tslint.json
diff --git a/...rules/member-ordering/custom/test.ts.lint → ...member-ordering/order/custom/test.ts.lint b/...rules/member-ordering/custom/test.ts.lint → ...member-ordering/order/custom/test.ts.lint
diff --git a/.../rules/member-ordering/custom/tslint.json → .../member-ordering/order/custom/tslint.json b/.../rules/member-ordering/custom/tslint.json → .../member-ordering/order/custom/tslint.json
diff --git a/...member-ordering/fields-first/test.ts.lint → ...-ordering/order/fields-first/test.ts.lint b/...member-ordering/fields-first/test.ts.lint → ...-ordering/order/fields-first/test.ts.lint
diff --git a/.../member-ordering/fields-first/tslint.json → ...r-ordering/order/fields-first/tslint.json b/.../member-ordering/fields-first/tslint.json → ...r-ordering/order/fields-first/tslint.json
diff --git a/...r-ordering/instance-sandwich/test.ts.lint → ...ring/order/instance-sandwich/test.ts.lint b/...r-ordering/instance-sandwich/test.ts.lint → ...ring/order/instance-sandwich/test.ts.lint
diff --git a/...er-ordering/instance-sandwich/tslint.json → ...ering/order/instance-sandwich/tslint.json b/...er-ordering/instance-sandwich/tslint.json → ...ering/order/instance-sandwich/tslint.json
diff --git a/...ember-ordering/statics-first/test.ts.lint → ...ordering/order/statics-first/test.ts.lint b/...ember-ordering/statics-first/test.ts.lint → ...ordering/order/statics-first/test.ts.lint
diff --git a/...member-ordering/statics-first/tslint.json → ...-ordering/order/statics-first/tslint.json b/...member-ordering/statics-first/tslint.json → ...-ordering/order/statics-first/tslint.json
diff --git a/test/rules/member-ordering/private/test.ts.lint b/test/rules/member-ordering/private/test.ts.lint
@@ -0,0 +1,10 @@
+class Foo {
+    private x: number;
+    private bar(): any {
+        var bla: { a: string } = {a: '1'};
+    }
+    y: number;
+    ~~~~~~~~~~ [0]
+}
+
+[0]: Declaration of public instance member variable not allowed to appear after declaration of private instance member function
diff --git a/...rdering/public-before-private/tslint.json → ...rules/member-ordering/private/tslint.json b/...rdering/public-before-private/tslint.json → ...rules/member-ordering/private/tslint.json
diff --git a/test/rules/member-ordering/public-before-private/test.ts.lint b/test/rules/member-ordering/public-before-private/test.ts.lint
diff --git a/test/rules/member-ordering/static-before-instance/test.ts.lint b/test/rules/member-ordering/static-before-instance/test.ts.lint
diff --git a/test/rules/member-ordering/static/test.ts.lint b/test/rules/member-ordering/static/test.ts.lint
@@ -0,0 +1,10 @@
+class Foo {
+    x: number;
+    static y: number;
+    ~~~~~~~~~~~~~~~~~ [0]
+    constructor() {
+        // nothing to do
+    }
+}
+
+[0]: Declaration of public static member variable not allowed to appear after declaration of public instance member variable
diff --git a/...dering/static-before-instance/tslint.json → .../rules/member-ordering/static/tslint.json b/...dering/static-before-instance/tslint.json → .../rules/member-ordering/static/tslint.json