From 54195cb67b2eff8f38fd88d2fedb564242224750 Mon Sep 17 00:00:00 2001 From: Alban Auzeill Date: Mon, 23 Dec 2019 16:17:55 +0100 Subject: Add Angular Material 'md' and Font Awesome 'fa' prefixes to default config of S4670 (#219) --- .../main/java/org/sonar/css/plugin/rules/SelectorTypeNoUnknown.java | 3 ++- .../src/test/java/org/sonar/css/plugin/rules/CssRuleTest.java | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'sonar-css-plugin') diff --git a/sonar-css-plugin/src/main/java/org/sonar/css/plugin/rules/SelectorTypeNoUnknown.java b/sonar-css-plugin/src/main/java/org/sonar/css/plugin/rules/SelectorTypeNoUnknown.java index abcf430..c7bc201 100644 --- a/sonar-css-plugin/src/main/java/org/sonar/css/plugin/rules/SelectorTypeNoUnknown.java +++ b/sonar-css-plugin/src/main/java/org/sonar/css/plugin/rules/SelectorTypeNoUnknown.java @@ -29,7 +29,8 @@ import static org.sonar.css.plugin.rules.RuleUtils.splitAndTrim; @Rule(key = "S4670") public class SelectorTypeNoUnknown implements CssRule { - private static final String DEFAULT_IGNORED_TYPES = "/^mat-/"; + // prefixes for Angular Material (mat, md), Font Awesome (fa) + private static final String DEFAULT_IGNORED_TYPES = "/^(mat|md|fa)-/"; @RuleProperty( key = "ignoreTypes", diff --git a/sonar-css-plugin/src/test/java/org/sonar/css/plugin/rules/CssRuleTest.java b/sonar-css-plugin/src/test/java/org/sonar/css/plugin/rules/CssRuleTest.java index 044f4f4..e7945b7 100644 --- a/sonar-css-plugin/src/test/java/org/sonar/css/plugin/rules/CssRuleTest.java +++ b/sonar-css-plugin/src/test/java/org/sonar/css/plugin/rules/CssRuleTest.java @@ -74,15 +74,15 @@ public class CssRuleTest { @Test public void selector_type_no_unknown_default() { String optionsAsJson = new Gson().toJson(new SelectorTypeNoUnknown().stylelintOptions()); - assertThat(optionsAsJson).isEqualTo("[true,{\"ignoreTypes\":[\"/^mat-/\"]}]"); + assertThat(optionsAsJson).isEqualTo("[true,{\"ignoreTypes\":[\"/^(mat|md|fa)-/\"]}]"); } @Test public void selector_type_no_unknown_custom() { SelectorTypeNoUnknown selectorTypeNoUnknown = new SelectorTypeNoUnknown(); - selectorTypeNoUnknown.ignoreTypes = "/^mat-/, /^fa-/"; + selectorTypeNoUnknown.ignoreTypes = "/^(mat|md|fa)-/"; String optionsAsJson = new Gson().toJson(selectorTypeNoUnknown.stylelintOptions()); - assertThat(optionsAsJson).isEqualTo("[true,{\"ignoreTypes\":[\"/^mat-/\",\"/^fa-/\"]}]"); + assertThat(optionsAsJson).isEqualTo("[true,{\"ignoreTypes\":[\"/^(mat|md|fa)-/\"]}]"); } @Test -- cgit v1.2.3