1 files changed, 66 insertions, 57 deletions
diff --git a/node_modules/tslint/lib/rules/memberOrderingRule.js b/node_modules/tslint/lib/rules/memberOrderingRule.js
index e7a27dcf9..c96c89e80 100644
--- a/node_modules/tslint/lib/rules/memberOrderingRule.js
+++ b/node_modules/tslint/lib/rules/memberOrderingRule.js
@@ -18,6 +18,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var ts = require("typescript");
+var error_1 = require("../error");
 var Lint = require("../index");
 var utils_1 = require("../utils");
 var OPTION_ORDER = "order";
@@ -109,68 +110,76 @@ var Rule = (function (_super) {
     };
     /* tslint:enable:object-literal-sort-keys */
     Rule.prototype.apply = function (sourceFile) {
-        return this.applyWithWalker(new MemberOrderingWalker(sourceFile, this.ruleName, parseOptions(this.ruleArguments)));
+        var options;
+        try {
+            options = parseOptions(this.ruleArguments);
+        }
+        catch (e) {
+            error_1.showWarningOnce("Warning: " + this.ruleName + " - " + e.message);
+            return [];
+        }
+        return this.applyWithWalker(new MemberOrderingWalker(sourceFile, this.ruleName, options));
     };
-    return Rule;
-}(Lint.Rules.AbstractRule));
-/* tslint:disable:object-literal-sort-keys */
-Rule.metadata = {
-    ruleName: "member-ordering",
-    description: "Enforces member ordering.",
-    rationale: "A consistent ordering for class members can make classes easier to read, navigate, and edit.",
-    optionsDescription: optionsDescription,
-    options: {
-        type: "object",
-        properties: {
-            order: {
-                oneOf: [
-                    {
-                        type: "string",
-                        enum: PRESET_NAMES,
-                    },
-                    {
-                        type: "array",
-                        items: {
+    /* tslint:disable:object-literal-sort-keys */
+    Rule.metadata = {
+        ruleName: "member-ordering",
+        description: "Enforces member ordering.",
+        rationale: "A consistent ordering for class members can make classes easier to read, navigate, and edit.",
+        optionsDescription: optionsDescription,
+        options: {
+            type: "object",
+            properties: {
+                order: {
+                    oneOf: [
+                        {
                             type: "string",
-                            enum: allMemberKindNames,
+                            enum: PRESET_NAMES,
+                        },
+                        {
+                            type: "array",
+                            items: {
+                                type: "string",
+                                enum: allMemberKindNames,
+                            },
+                            maxLength: 13,
                         },
-                        maxLength: 13,
-                    },
-                ],
+                    ],
+                },
             },
+            additionalProperties: false,
         },
-        additionalProperties: false,
-    },
-    optionExamples: [
-        [true, { order: "fields-first" }],
-        [true, {
-                order: [
-                    "static-field",
-                    "instance-field",
-                    "constructor",
-                    "public-instance-method",
-                    "protected-instance-method",
-                    "private-instance-method",
-                ],
-            }],
-        [true, {
-                order: [
-                    {
-                        name: "static non-private",
-                        kinds: [
-                            "public-static-field",
-                            "protected-static-field",
-                            "public-static-method",
-                            "protected-static-method",
-                        ],
-                    },
-                    "constructor",
-                ],
-            }],
-    ],
-    type: "typescript",
-    typescriptOnly: false,
-};
+        optionExamples: [
+            [true, { order: "fields-first" }],
+            [true, {
+                    order: [
+                        "static-field",
+                        "instance-field",
+                        "constructor",
+                        "public-instance-method",
+                        "protected-instance-method",
+                        "private-instance-method",
+                    ],
+                }],
+            [true, {
+                    order: [
+                        {
+                            name: "static non-private",
+                            kinds: [
+                                "public-static-field",
+                                "protected-static-field",
+                                "public-static-method",
+                                "protected-static-method",
+                            ],
+                        },
+                        "constructor",
+                    ],
+                }],
+        ],
+        type: "typescript",
+        typescriptOnly: false,
+    };
+    return Rule;
+}(Lint.Rules.AbstractRule));
 exports.Rule = Rule;
 var MemberOrderingWalker = (function (_super) {
     tslib_1.__extends(MemberOrderingWalker, _super);