aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-css-plugin/src/main
diff options
context:
space:
mode:
authorAmaury Levé2018-06-27 11:38:45 +0200
committerAmaury Levé2018-06-27 12:48:29 +0200
commit364780c6760b452f19f3a52cd4be3a675abacccf (patch)
tree8e8da1b05f6d6c69ca415c7e8bd135402c221d81 /sonar-css-plugin/src/main
parent35c3b4a9e20797067876ce2e8ec1cb7f1b3a0761 (diff)
downloadsonar-css-364780c6760b452f19f3a52cd4be3a675abacccf.tar.bz2
Update S4656: Ignore consecutive duplications with different values
Diffstat (limited to 'sonar-css-plugin/src/main')
-rw-r--r--sonar-css-plugin/src/main/java/org/sonar/css/plugin/CssRules.java4
-rw-r--r--sonar-css-plugin/src/main/java/org/sonar/css/plugin/rules/CssRule.java3
-rw-r--r--sonar-css-plugin/src/main/java/org/sonar/css/plugin/rules/DeclarationBlockNoDuplicateProperties.java12
3 files changed, 17 insertions, 2 deletions
diff --git a/sonar-css-plugin/src/main/java/org/sonar/css/plugin/CssRules.java b/sonar-css-plugin/src/main/java/org/sonar/css/plugin/CssRules.java
index b2f8121..926fff0 100644
--- a/sonar-css-plugin/src/main/java/org/sonar/css/plugin/CssRules.java
+++ b/sonar-css-plugin/src/main/java/org/sonar/css/plugin/CssRules.java
@@ -67,7 +67,7 @@ public class CssRules {
stylelintKeyToRuleKey = new HashMap<>();
for (CssRule rule : enabledRules) {
stylelintKeyToRuleKey.put(rule.stylelintKey(), checks.ruleKey(rule));
- config.rules.put(rule.stylelintKey(), true);
+ config.rules.put(rule.stylelintKey(), rule.stylelintOptions());
}
}
@@ -114,6 +114,6 @@ public class CssRules {
}
public static class StylelintConfig {
- Map<String, Boolean> rules = new HashMap<>();
+ Map<String, Object> rules = new HashMap<>();
}
}
diff --git a/sonar-css-plugin/src/main/java/org/sonar/css/plugin/rules/CssRule.java b/sonar-css-plugin/src/main/java/org/sonar/css/plugin/rules/CssRule.java
index 237228b..fdc577b 100644
--- a/sonar-css-plugin/src/main/java/org/sonar/css/plugin/rules/CssRule.java
+++ b/sonar-css-plugin/src/main/java/org/sonar/css/plugin/rules/CssRule.java
@@ -23,4 +23,7 @@ public interface CssRule {
String stylelintKey();
+ default Object stylelintOptions() {
+ return true;
+ }
}
diff --git a/sonar-css-plugin/src/main/java/org/sonar/css/plugin/rules/DeclarationBlockNoDuplicateProperties.java b/sonar-css-plugin/src/main/java/org/sonar/css/plugin/rules/DeclarationBlockNoDuplicateProperties.java
index 75382de..5c4b00a 100644
--- a/sonar-css-plugin/src/main/java/org/sonar/css/plugin/rules/DeclarationBlockNoDuplicateProperties.java
+++ b/sonar-css-plugin/src/main/java/org/sonar/css/plugin/rules/DeclarationBlockNoDuplicateProperties.java
@@ -19,6 +19,9 @@
*/
package org.sonar.css.plugin.rules;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
import org.sonar.check.Rule;
@Rule(key = "S4656")
@@ -28,4 +31,13 @@ public class DeclarationBlockNoDuplicateProperties implements CssRule {
public String stylelintKey() {
return "declaration-block-no-duplicate-properties";
}
+
+ @Override
+ public Object stylelintOptions() {
+ return Arrays.asList(true, new StylelintIgnoreOption());
+ }
+
+ private static class StylelintIgnoreOption {
+ private final List<String> ignore = Collections.singletonList("consecutive-duplicates-with-different-values");
+ }
}