1 files changed, 12 insertions, 13 deletions
diff --git a/node_modules/tslint/lib/rules/quotemarkRule.js b/node_modules/tslint/lib/rules/quotemarkRule.js
index 1f1a76b4c..19586069a 100644
--- a/node_modules/tslint/lib/rules/quotemarkRule.js
+++ b/node_modules/tslint/lib/rules/quotemarkRule.js
@@ -19,7 +19,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var tsutils_1 = require("tsutils");
 var ts = require("typescript");
-var error_1 = require("../error");
 var Lint = require("../index");
 var OPTION_SINGLE = "single";
 var OPTION_DOUBLE = "double";
@@ -27,7 +26,7 @@ var OPTION_JSX_SINGLE = "jsx-single";
 var OPTION_JSX_DOUBLE = "jsx-double";
 var OPTION_AVOID_TEMPLATE = "avoid-template";
 var OPTION_AVOID_ESCAPE = "avoid-escape";
-var Rule = (function (_super) {
+var Rule = /** @class */ (function (_super) {
     tslib_1.__extends(Rule, _super);
     function Rule() {
         return _super !== null && _super.apply(this, arguments) || this;
@@ -36,18 +35,9 @@ var Rule = (function (_super) {
     Rule.FAILURE_STRING = function (actual, expected) {
         return actual + " should be " + expected;
     };
-    Rule.prototype.isEnabled = function () {
-        return _super.prototype.isEnabled.call(this) && (this.ruleArguments[0] === OPTION_SINGLE || this.ruleArguments[0] === OPTION_DOUBLE);
-    };
     Rule.prototype.apply = function (sourceFile) {
         var args = this.ruleArguments;
-        if (args.length > 0) {
-            if (args[0] !== OPTION_SINGLE && args[0] !== OPTION_DOUBLE) {
-                error_1.showWarningOnce("Warning: First argument to 'quotemark' rule should be \"" + OPTION_SINGLE + "\" or \"" + OPTION_DOUBLE + "\"");
-                return [];
-            }
-        }
-        var quoteMark = args[0] === OPTION_SINGLE ? "'" : '"';
+        var quoteMark = getQuotemarkPreference(args) === OPTION_SINGLE ? "'" : '"';
         return this.applyWithFunction(sourceFile, walk, {
             avoidEscape: hasArg(OPTION_AVOID_ESCAPE),
             avoidTemplate: hasArg(OPTION_AVOID_TEMPLATE),
@@ -68,7 +58,7 @@ var Rule = (function (_super) {
             type: "array",
             items: {
                 type: "string",
-                enum: [OPTION_SINGLE, OPTION_DOUBLE, OPTION_JSX_SINGLE, OPTION_JSX_DOUBLE, OPTION_AVOID_ESCAPE],
+                enum: [OPTION_SINGLE, OPTION_DOUBLE, OPTION_JSX_SINGLE, OPTION_JSX_DOUBLE, OPTION_AVOID_ESCAPE, OPTION_AVOID_TEMPLATE],
             },
             minLength: 0,
             maxLength: 5,
@@ -119,4 +109,13 @@ function walk(ctx) {
         ts.forEachChild(node, cb);
     });
 }
+function getQuotemarkPreference(args) {
+    for (var _i = 0, args_1 = args; _i < args_1.length; _i++) {
+        var arg = args_1[_i];
+        if (arg === OPTION_SINGLE || arg === OPTION_DOUBLE) {
+            return arg;
+        }
+    }
+    return undefined;
+}
 var _a;