Merge pull request palantir#171 from DickvdBrink/interface-rename

Renamed Rule and Formatter interface
jim-jim-jim · Jun 25, 2014 · 4b00775 · 4b00775
2 parents 177c30c + 3f7776e
commit 4b00775
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/lib/tslint.d.ts b/lib/tslint.d.ts
@@ -6483,7 +6483,7 @@ declare module Lint {
         startPosition: number;
         endPosition: number;
     }
-    interface Rule {
+    interface IRule {
         getOptions(): IOptions;
         isEnabled(): boolean;
         apply(syntaxTree: TypeScript.SyntaxTree): RuleFailure[];
@@ -6547,14 +6547,14 @@ declare module Lint {
         [name: string]: any;
     }, enableDisableRuleMap: {
         [rulename: string]: IEnableDisablePosition[];
-    }, rulesDirectory?: string): Rule[];
+    }, rulesDirectory?: string): IRule[];
     function findRule(name: string, rulesDirectory?: string): any;
 }
 declare module Lint.Configuration {
     function findConfiguration(configFile: string): any;
 }
 declare module Lint {
-    interface Formatter {
+    interface IFormatter {
         format(failures: Lint.RuleFailure[]): string;
     }
 }
@@ -10800,12 +10800,12 @@ declare module Lint {
     function doesIntersect(failure: RuleFailure, disabledIntervals: IDisabledInterval[]): boolean;
 }
 declare module Lint.Formatters {
-    class AbstractFormatter implements Lint.Formatter {
+    class AbstractFormatter implements Lint.IFormatter {
         public format(failures: Lint.RuleFailure[]): string;
     }
 }
 declare module Lint.Rules {
-    class AbstractRule implements Lint.Rule {
+    class AbstractRule implements Lint.IRule {
         private value;
         private options;
         constructor(ruleName: string, value: any, disabledIntervals: Lint.IDisabledInterval[]);

diff --git a/src/language/formatter/abstractFormatter.ts b/src/language/formatter/abstractFormatter.ts
@@ -18,7 +18,7 @@
 /// <reference path='formatter.ts' />
 
 module Lint.Formatters {
-    export class AbstractFormatter implements Lint.Formatter {
+    export class AbstractFormatter implements Lint.IFormatter {
         /* tslint:disable:no-unused-variable */
         public format(failures: Lint.RuleFailure[]): string {
             throw TypeScript.Errors.abstract();

diff --git a/src/language/formatter/formatter.ts b/src/language/formatter/formatter.ts
@@ -18,7 +18,7 @@
 /// <reference-path='../rule/rule.ts'/>
 
 module Lint {
-    export interface Formatter {
+    export interface IFormatter {
         format(failures: Lint.RuleFailure[]): string;
     }
 }
diff --git a/src/language/rule/abstractRule.ts b/src/language/rule/abstractRule.ts
@@ -19,7 +19,7 @@
 /// <reference path='rule.ts'/>
 
 module Lint.Rules {
-    export class AbstractRule implements Lint.Rule {
+    export class AbstractRule implements Lint.IRule {
         private value: any;
         private options: Lint.IOptions;
 

diff --git a/src/language/rule/rule.ts b/src/language/rule/rule.ts
@@ -29,7 +29,7 @@ module Lint {
         endPosition: number;
     }
 
-    export interface Rule {
+    export interface IRule {
         getOptions(): IOptions;
 
         isEnabled(): boolean;

diff --git a/src/ruleLoader.ts b/src/ruleLoader.ts
@@ -32,8 +32,8 @@ module Lint {
 
     export function loadRules(ruleConfiguration: {[name: string]: any},
                               enableDisableRuleMap: {[rulename: string]: Lint.IEnableDisablePosition[]},
-                              rulesDirectory?: string): Rule[] {
-        var rules: Rule[] = [];
+                              rulesDirectory?: string): IRule[] {
+        var rules: IRule[] = [];
         for (var ruleName in ruleConfiguration) {
             if (ruleConfiguration.hasOwnProperty(ruleName)) {
                 var ruleValue = ruleConfiguration[ruleName];

diff --git a/src/tslint.ts b/src/tslint.ts
@@ -82,7 +82,7 @@ module Lint {
                 }
             }
 
-            var formatter: Lint.Formatter;
+            var formatter: Lint.IFormatter;
             var formattersDirectory = this.getRelativePath(this.options.formattersDirectory);
 
             var Formatter = Lint.findFormatter(this.options.formatter, formattersDirectory);