member-ordering: Support categories (#2041)

palantir · Jan 19, 2017 · 18e7604 · 18e7604
1 parent 2ce15c7
commit 18e7604
Show file tree

Hide file tree

Showing 21 changed files with 347 additions and 187 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
@@ -0,0 +1,10 @@
+class C {
+    static foo() {}
+    protected static bar = 0;
+    static baz();
+
+    constructor();
+
+    static bang();
+    ~~~~~~~~~~~~~~ [Declaration of static non-private not allowed after declaration of constructor. Instead, this should come at the beginning of the class/interface.]
+}
diff --git a/test/rules/member-ordering/custom-categories/tslint.json b/test/rules/member-ordering/custom-categories/tslint.json
@@ -0,0 +1,18 @@
+{
+    "rules": {
+        "member-ordering": [true, {
+            "order": [
+                {
+                    "name": "static non-private",
+                    "kinds": [
+                        "public-static-field",
+                        "protected-static-field",
+                        "public-static-method",
+                        "protected-static-method"
+                    ]
+                },
+                "constructor"
+            ]
+        }]
+    }
+}
diff --git a/...member-ordering/order/custom/test.ts.lint → ...rules/member-ordering/custom/test.ts.lint b/...member-ordering/order/custom/test.ts.lint → ...rules/member-ordering/custom/test.ts.lint
diff --git a/.../member-ordering/order/custom/tslint.json → .../rules/member-ordering/custom/tslint.json b/.../member-ordering/order/custom/tslint.json → .../rules/member-ordering/custom/tslint.json
diff --git a/...-ordering/order/fields-first/test.ts.lint → ...member-ordering/fields-first/test.ts.lint b/...-ordering/order/fields-first/test.ts.lint → ...member-ordering/fields-first/test.ts.lint
diff --git a/...r-ordering/order/fields-first/tslint.json → .../member-ordering/fields-first/tslint.json b/...r-ordering/order/fields-first/tslint.json → .../member-ordering/fields-first/tslint.json
diff --git a/...ring/order/instance-sandwich/test.ts.lint → ...r-ordering/instance-sandwich/test.ts.lint b/...ring/order/instance-sandwich/test.ts.lint → ...r-ordering/instance-sandwich/test.ts.lint
diff --git a/...ering/order/instance-sandwich/tslint.json → ...er-ordering/instance-sandwich/tslint.json b/...ering/order/instance-sandwich/tslint.json → ...er-ordering/instance-sandwich/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
@@ -0,0 +1,12 @@
+class C {
+    private static x = 0;
+    static y = 1;
+
+    x = 0;
+    private y = 1;
+
+    constructor() {}
+
+    static z = 2;
+    ~~~~~~~~~~~~~ [Declaration of static field not allowed after declaration of constructor. Instead, this should come at the beginning of the class/interface.]
+}
diff --git a/test/rules/member-ordering/omit-access-modifier/tslint.json b/test/rules/member-ordering/omit-access-modifier/tslint.json
@@ -0,0 +1,9 @@
+{
+    "rules": {
+        "member-ordering": [true, { "order": [
+            "static-field",
+            "instance-field",
+            "constructor"
+        ]}]
+    }
+}
diff --git a/test/rules/member-ordering/private/test.ts.lint b/test/rules/member-ordering/private/test.ts.lint
diff --git a/test/rules/member-ordering/public-before-private/test.ts.lint b/test/rules/member-ordering/public-before-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 member not allowed after declaration of private member. Instead, this should come at the beginning of the class/interface.
diff --git a/...rules/member-ordering/private/tslint.json → ...rdering/public-before-private/tslint.json b/...rules/member-ordering/private/tslint.json → ...rdering/public-before-private/tslint.json
diff --git a/test/rules/member-ordering/static-before-instance/test.ts.lint b/test/rules/member-ordering/static-before-instance/test.ts.lint
@@ -0,0 +1,10 @@
+class Foo {
+    x: number;
+    static y: number;
+    ~~~~~~~~~~~~~~~~~ [0]
+    constructor() {
+        // nothing to do
+    }
+}
+
+[0]: Declaration of static member not allowed after declaration of instance member. Instead, this should come at the beginning of the class/interface.
diff --git a/.../rules/member-ordering/static/tslint.json → ...dering/static-before-instance/tslint.json b/.../rules/member-ordering/static/tslint.json → ...dering/static-before-instance/tslint.json
diff --git a/test/rules/member-ordering/static/test.ts.lint b/test/rules/member-ordering/static/test.ts.lint
diff --git a/...ordering/order/statics-first/test.ts.lint → ...ember-ordering/statics-first/test.ts.lint b/...ordering/order/statics-first/test.ts.lint → ...ember-ordering/statics-first/test.ts.lint
diff --git a/...-ordering/order/statics-first/tslint.json → ...member-ordering/statics-first/tslint.json b/...-ordering/order/statics-first/tslint.json → ...member-ordering/statics-first/tslint.json
diff --git a/...rules/member-ordering/method/test.ts.lint → ...g/variables-before-functions/test.ts.lint b/...rules/member-ordering/method/test.ts.lint → ...g/variables-before-functions/test.ts.lint
@@ -68,5 +68,4 @@ const o = {
     }
 }
 
-[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/.../rules/member-ordering/method/tslint.json → ...ng/variables-before-functions/tslint.json b/.../rules/member-ordering/method/tslint.json → ...ng/variables-before-functions/tslint.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -68,5 +68,4 @@ const o = { @@
         }
     }
-    [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.