make rule immutable

ovr · Aug 4, 2013 · b6daa76 · b6daa76
1 parent 6c844f1
commit b6daa76
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 42 deletions.
diff --git a/bin/tslint-cli.js b/bin/tslint-cli.js
@@ -26214,8 +26214,9 @@ var Lint;
 (function (Lint) {
     (function (Rules) {
         var AbstractRule = (function () {
-            function AbstractRule(name) {
+            function AbstractRule(name, value) {
                 this.name = name;
+                this.value = value;
             }
             AbstractRule.prototype.getName = function () {
                 return this.name;
@@ -26225,10 +26226,6 @@ var Lint;
                 return this.value;
             };
 
-            AbstractRule.prototype.setValue = function (value) {
-                this.value = value;
-            };
-
             AbstractRule.prototype.apply = function (syntaxTree) {
                 throw TypeScript.Errors.abstract();
             };
@@ -26744,7 +26741,7 @@ var Lint;
                 } else if (quoteStyleString === "double") {
                     quoteStyle = QuoteStyle.DOUBLE_QUOTES;
                 } else {
-                    throw new Error("Unknown quote style " + quoteStyle);
+                    throw new Error("Unknown quote style " + quoteStyleString);
                 }
 
                 return this.applyWithWalker(new QuoteWalker(syntaxTree, quoteStyle));
@@ -27431,18 +27428,18 @@ var Lint;
             "whitespace": Rules.WhitespaceRule.prototype
         };
 
-        function getRuleForName(name) {
+        function createRule(name, value) {
+            var rule = undefined;
             var rulePrototype = ALL_RULES[name];
-            if (rulePrototype === undefined) {
-                return rulePrototype;
-            }
 
-            var rule = Object.create(rulePrototype);
-            rule.constructor(name);
+            if (rulePrototype !== undefined) {
+                rule = Object.create(rulePrototype);
+                rule.constructor(name, value);
+            }
 
             return rule;
         }
-        Rules.getRuleForName = getRuleForName;
+        Rules.createRule = createRule;
     })(Lint.Rules || (Lint.Rules = {}));
     var Rules = Lint.Rules;
 })(Lint || (Lint = {}));
@@ -27485,15 +27482,13 @@ var Lint;
 
             for (var ruleName in configuration) {
                 if (configuration.hasOwnProperty(ruleName)) {
-                    var rule = Lint.Rules.getRuleForName(ruleName);
+                    var ruleValue = configuration[ruleName];
+                    var rule = Lint.Rules.createRule(ruleName, ruleValue);
                     if (rule === undefined) {
                         console.warn("ignoring unrecognized rule '" + ruleName + "'");
-                        continue;
+                    } else {
+                        rules.push(rule);
                     }
-
-                    var ruleValue = configuration[ruleName];
-                    rule.setValue(ruleValue);
-                    rules.push(rule);
                 }
             }
 

diff --git a/src/configuration.ts b/src/configuration.ts
@@ -54,15 +54,13 @@ module Lint.Configuration {
 
         for (var ruleName in configuration) {
             if (configuration.hasOwnProperty(ruleName)) {
-                var rule = Lint.Rules.getRuleForName(ruleName);
+                var ruleValue = configuration[ruleName];
+                var rule = Rules.createRule(ruleName, ruleValue);
                 if (rule === undefined) {
                     console.warn("ignoring unrecognized rule '" + ruleName + "'");
-                    continue;
-                  }
-
-                var ruleValue = configuration[ruleName];
-                rule.setValue(ruleValue);
-                rules.push(rule);
+                } else {
+                    rules.push(rule);
+                }
             }
         }
 

diff --git a/src/rules/abstractRule.ts b/src/rules/abstractRule.ts
@@ -24,8 +24,9 @@ module Lint.Rules {
         private name: string;
         private value: any;
 
-        constructor(name: string) {
+        constructor(name: string, value: any) {
             this.name = name;
+            this.value = value;
         }
 
         public getName() {
@@ -36,10 +37,6 @@ module Lint.Rules {
             return this.value;
         }
 
-        public setValue(value: any): void {
-            this.value = value;
-        }
-
         public apply(syntaxTree: TypeScript.SyntaxTree): RuleFailure[] {
             throw TypeScript.Errors.abstract();
         }

diff --git a/src/rules/quoteStyleRule.ts b/src/rules/quoteStyleRule.ts
@@ -35,7 +35,7 @@ module Lint.Rules {
             } else if (quoteStyleString === "double") {
                 quoteStyle = QuoteStyle.DOUBLE_QUOTES;
             } else {
-                throw new Error("Unknown quote style " + quoteStyle);
+                throw new Error("Unknown quote style " + quoteStyleString);
             }
 
             return this.applyWithWalker(new QuoteWalker(syntaxTree, quoteStyle));
@@ -48,7 +48,7 @@ module Lint.Rules {
 
         private quoteStyle : QuoteStyle;
 
-        constructor (syntaxTree: TypeScript.SyntaxTree, quoteStyle: QuoteStyle) {
+        constructor(syntaxTree: TypeScript.SyntaxTree, quoteStyle: QuoteStyle) {
             super(syntaxTree);
             this.quoteStyle = quoteStyle;
         }

diff --git a/src/rules/rule.ts b/src/rules/rule.ts
@@ -19,14 +19,11 @@
 
 module Lint {
 
-    // TODO: Make this immutable somehow
     export interface Rule {
         getName(): string;
 
         getValue(): any;
 
-        setValue(value: any): void;
-
         apply(syntaxTree: TypeScript.SyntaxTree): RuleFailure[];
     }
 

diff --git a/src/rules/rules.ts b/src/rules/rules.ts
@@ -57,14 +57,14 @@ module Lint.Rules {
         "whitespace": WhitespaceRule.prototype
     }
 
-    export function getRuleForName(name: string): Rule {
+    export function createRule(name: string, value: any): Rule {
+        var rule = undefined;
         var rulePrototype = ALL_RULES[name];
-        if(rulePrototype === undefined) {
-            return rulePrototype;
-        }
 
-        var rule = Object.create(rulePrototype);
-        rule.constructor(name);
+        if (rulePrototype !== undefined) {
+            rule = Object.create(rulePrototype);
+            rule.constructor(name, value);
+        }
 
         return rule;
     }