From 38ef9d95ebe617da49d62e115b4ba637aeabbaa9 Mon Sep 17 00:00:00 2001 From: Adi Dahiya Date: Mon, 9 Sep 2019 19:43:20 -0400 Subject: [PATCH] fix(file-name-casing): ignore option works correctly (#4848) --- src/rules/fileNameCasingRule.ts | 10 ++++++++-- test/rules/file-name-casing/complex/tslint.json | 6 +++--- test/rules/file-name-casing/ignore/tslint.json | 4 ++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/rules/fileNameCasingRule.ts b/src/rules/fileNameCasingRule.ts index 342b1e970f9..df9c50d371a 100644 --- a/src/rules/fileNameCasingRule.ts +++ b/src/rules/fileNameCasingRule.ts @@ -25,7 +25,7 @@ import { isCamelCased, isKebabCased, isPascalCased, isSnakeCased } from "../util enum Casing { CamelCase = "camel-case", PascalCase = "pascal-case", - Ignored = "ignored", + Ignored = "ignore", KebabCase = "kebab-case", SnakeCase = "snake-case", } @@ -40,7 +40,13 @@ type ValidationResult = Casing | undefined; type Validator = (sourceFile: ts.SourceFile, casing: T) => ValidationResult; -const rules = [Casing.CamelCase, Casing.PascalCase, Casing.KebabCase, Casing.SnakeCase]; +const rules = [ + Casing.CamelCase, + Casing.Ignored, + Casing.PascalCase, + Casing.KebabCase, + Casing.SnakeCase, +]; const validCasingOptions = new Set(rules); diff --git a/test/rules/file-name-casing/complex/tslint.json b/test/rules/file-name-casing/complex/tslint.json index b364553a0f8..be350316521 100644 --- a/test/rules/file-name-casing/complex/tslint.json +++ b/test/rules/file-name-casing/complex/tslint.json @@ -1,9 +1,9 @@ { "rules": { "file-name-casing": [true, { - ".component.ts": "pascal-case", - ".tsx": "pascal-case", - ".ts": "camel-case" + ".component.ts$": "pascal-case", + ".tsx$": "pascal-case", + ".ts$": "camel-case" }] } } diff --git a/test/rules/file-name-casing/ignore/tslint.json b/test/rules/file-name-casing/ignore/tslint.json index b9920d2c320..dab56203717 100644 --- a/test/rules/file-name-casing/ignore/tslint.json +++ b/test/rules/file-name-casing/ignore/tslint.json @@ -1,8 +1,8 @@ { "rules": { "file-name-casing": [true, { - ".ts": "ignore", - ".tsx": "pascal-case" + ".ts$": "ignore", + ".tsx$": "pascal-case" }] } }