fix: rename rule due to duplicate rule name of tslint-react

crazyfactory · Mar 14, 2019 · d212c04 · d212c04
1 parent 6a8154c
commit d212c04
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 6 deletions.
diff --git a/src/jsxSpaceBeforeTrailingSlashRule.ts → src/jsxSpaceBeforeClosingTagRule.ts b/src/jsxSpaceBeforeTrailingSlashRule.ts → src/jsxSpaceBeforeClosingTagRule.ts
@@ -1,7 +1,7 @@
 import * as Lint from "tslint";
 import * as ts from "typescript";
 
-class JsxSpaceBeforeTrailingSlashRule extends Lint.RuleWalker {
+class JsxSpaceBeforeClosingTagRule extends Lint.RuleWalker {
   private readonly enforceWhiteSpace: boolean = true;
   constructor(
     sourceFile: ts.SourceFile,
@@ -20,12 +20,12 @@ class JsxSpaceBeforeTrailingSlashRule extends Lint.RuleWalker {
   public visitJsxSelfClosingElement(node: ts.JsxSelfClosingElement): void {
     super.visitJsxSelfClosingElement(node);
     if (this.enforceWhiteSpace) {
-      if (!JsxSpaceBeforeTrailingSlashRule.hasWhitespaceBeforeClosing(node.getText())) {
+      if (!JsxSpaceBeforeClosingTagRule.hasWhitespaceBeforeClosing(node.getText())) {
         this.addFailureAtNode(node, "Self-closing JSX elements must have a space before the '/>' part");
         return;
       }
     } else {
-      if (!/[\r\n]/.test(node.getText()) && JsxSpaceBeforeTrailingSlashRule.hasWhitespaceBeforeClosing(node.getText())) {
+      if (!/[\r\n]/.test(node.getText()) && JsxSpaceBeforeClosingTagRule.hasWhitespaceBeforeClosing(node.getText())) {
         this.addFailureAtNode(node, "One-line self-closing JSX elements must not have a space(s) before the '/>' part");
         return;
       }
@@ -36,6 +36,6 @@ class JsxSpaceBeforeTrailingSlashRule extends Lint.RuleWalker {
 // tslint:disable-next-line:export-name max-classes-per-file
 export class Rule extends Lint.Rules.TypedRule {
   public applyWithProgram(sourceFile: ts.SourceFile, program: ts.Program): Lint.RuleFailure[] {
-    return this.applyWithWalker(new JsxSpaceBeforeTrailingSlashRule(sourceFile, this.getOptions()));
+    return this.applyWithWalker(new JsxSpaceBeforeClosingTagRule(sourceFile, this.getOptions()));
   }
 }
diff --git a/...fore-trailing-slash/default/test.tsx.lint → ...-before-closing-tag/default/test.tsx.lint b/...fore-trailing-slash/default/test.tsx.lint → ...-before-closing-tag/default/test.tsx.lint
diff --git a/...fore-trailing-slash/default/tsconfig.json → ...-before-closing-tag/default/tsconfig.json b/...fore-trailing-slash/default/tsconfig.json → ...-before-closing-tag/default/tsconfig.json
diff --git a/...before-trailing-slash/default/tslint.json → ...ce-before-closing-tag/default/tslint.json b/...before-trailing-slash/default/tslint.json → ...ce-before-closing-tag/default/tslint.json
@@ -3,6 +3,6 @@
     "../../../../lib"
   ],
   "rules": {
-    "jsx-space-before-trailing-slash": true
+    "jsx-space-before-closing-tag": true
   }
 }
diff --git a/...before-trailing-slash/never/test.tsx.lint → ...ce-before-closing-tag/never/test.tsx.lint b/...before-trailing-slash/never/test.tsx.lint → ...ce-before-closing-tag/never/test.tsx.lint
diff --git a/...before-trailing-slash/never/tsconfig.json → ...ce-before-closing-tag/never/tsconfig.json b/...before-trailing-slash/never/tsconfig.json → ...ce-before-closing-tag/never/tsconfig.json
diff --git a/...e-before-trailing-slash/never/tslint.json → ...pace-before-closing-tag/never/tslint.json b/...e-before-trailing-slash/never/tslint.json → ...pace-before-closing-tag/never/tslint.json
@@ -3,6 +3,6 @@
     "../../../../lib"
   ],
   "rules": {
-    "jsx-space-before-trailing-slash": [true, "never"]
+    "jsx-space-before-closing-tag": [true, "never"]
   }
 }