Fix #84 Validation issue when value contains an SCSS list

Author: racodond

css-checks/src/main/java/org/sonar/css/checks/RuleDescriptionsGenerator.java

@@ -44,8 +44,8 @@ public class RuleDescriptionsGenerator {
   private static final String UTF_8 = "UTF-8";
 
   private static final Map<String, String> CSS_OBJECT_LINKS = ImmutableMap.<String, String>builder()
-    .put("|", "https://developer.mozilla.org/en-US/docs/Web/CSS/Value_definition_syntax#Single_bar")
     .put("||", "https://developer.mozilla.org/en-US/docs/Web/CSS/Value_definition_syntax#Double_bar")
+    .put("|", "https://developer.mozilla.org/en-US/docs/Web/CSS/Value_definition_syntax#Single_bar")
     .put("&&", "https://developer.mozilla.org/en-US/docs/Web/CSS/Value_definition_syntax#Double_ampersand")
     .put("?", "https://developer.mozilla.org/en-US/docs/Web/CSS/Value_definition_syntax#Question_mark_()")
     .put("+", "https://developer.mozilla.org/en-US/docs/Web/CSS/Value_definition_syntax#Plus_()")

css-checks/src/main/java/org/sonar/css/checks/common/FontFaceBrowserCompatibilityCheck.java

@@ -22,23 +22,24 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
 import org.sonar.check.Priority;
 import org.sonar.check.Rule;
 import org.sonar.check.RuleProperty;
 import org.sonar.css.checks.CheckList;
 import org.sonar.css.checks.CheckUtils;
 import org.sonar.css.checks.Tags;
 import org.sonar.css.model.property.standard.Src;
+import org.sonar.plugins.css.api.tree.Tree;
 import org.sonar.plugins.css.api.tree.css.*;
 import org.sonar.plugins.css.api.visitors.DoubleDispatchVisitorCheck;
 import org.sonar.squidbridge.annotations.SqaleConstantRemediation;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
 /*
  * https://css-tricks.com/snippets/css/using-font-face/
  * http://blog.fontspring.com/2011/02/further-hardening-of-the-bulletproof-syntax/
@@ -102,7 +103,7 @@ private boolean isFontFaceRuleToBeChecked(AtRuleTree tree) {
   private boolean definesScrPropertyWithUrl(List<PropertyDeclarationTree> declarations) {
     for (PropertyDeclarationTree declaration : declarations)
       if (declaration.property().standardProperty() instanceof Src
-        && !declaration.value().valueElementsOfType(UriTree.class).isEmpty()) {
+        && !getUris(declaration).isEmpty()) {
         return true;
       }
     return false;
@@ -161,9 +162,7 @@ private void checkSecondToLastSrcPropertyDeclaration(PropertyDeclarationTree dec
   }
 
   private void checkLastSrcProperty(PropertyDeclarationTree declaration) {
-    List<UriTree> uris = declaration.value().valueElementsOfType(UriTree.class).stream()
-      .filter(t -> t.uriContent() != null && !t.uriContent().text().isEmpty())
-      .collect(Collectors.toList());
+    List<UriTree> uris = getUris(declaration);
 
     if (uris.isEmpty()) {
       addPreciseIssue(declaration.property(), "URL for \"" + FORMAT.get(browserSupportLevel).get(0) + "\" format is expected.");
@@ -220,6 +219,22 @@ private void checkLastSrcProperty(PropertyDeclarationTree declaration) {
     }
   }
 
+  private List<UriTree> getUris(PropertyDeclarationTree declaration) {
+    List<UriTree> uris = new ArrayList<>();
+    if (declaration.value().valueElements().get(0).is(Tree.Kind.VALUE_COMMA_SEPARATED_LIST)) {
+      for (ValueTree v : ((ValueCommaSeparatedListTree) declaration.value().valueElements().get(0)).values()) {
+        uris.addAll(v.valueElementsOfType(UriTree.class).stream()
+          .filter(t -> t.uriContent() != null && !t.uriContent().text().isEmpty())
+          .collect(Collectors.toList()));
+      }
+    } else {
+      uris = declaration.value().valueElementsOfType(UriTree.class).stream()
+        .filter(t -> t.uriContent() != null && !t.uriContent().text().isEmpty())
+        .collect(Collectors.toList());
+    }
+    return uris;
+  }
+
   @Override
   public void validateParameters() {
     if (!BASIC_LEVEL.equals(browserSupportLevel) && !DEEP_LEVEL.equals(browserSupportLevel) && !DEEPEST_LEVEL.equals(browserSupportLevel)) {

css-checks/src/main/java/org/sonar/css/checks/common/FormattingCheck.java

@@ -163,7 +163,7 @@ public void visitAtRule(AtRuleTree tree) {
   private void checkAtRuleOpeningCurlyBrace(AtRuleTree tree) {
     Preconditions.checkNotNull(tree.block());
 
-    Tree tree1 = tree.preludes() != null ? tree.preludes().get(tree.preludes().size() - 1) : tree.atKeyword();
+    Tree tree1 = tree.preludes() != null ? tree.preludes() : tree.atKeyword();
     Tree tree2 = tree.block().openCurlyBrace();
 
     if (!isOnSameLine(tree1, tree2)) {

css-checks/src/main/java/org/sonar/css/checks/common/SingleQuotesCheck.java

@@ -62,7 +62,9 @@ private void checkForDoubleQuotes(StringTree tree) {
   }
 
   private boolean isEncodingOfCharsetAtRule(StringTree tree) {
-    return tree.parent() instanceof AtRuleTree && ((AtRuleTree) tree.parent()).standardAtRule() instanceof Charset;
+    return tree.parent() != null
+      && tree.parent().parent() instanceof AtRuleTree
+      && ((AtRuleTree) tree.parent().parent()).standardAtRule() instanceof Charset;
   }
 
   private boolean containsQuote(String text) {

css-checks/src/test/resources/checks/common/fontface/basic.css

@@ -2,13 +2,13 @@
 }
 
 @font-face {
- font-family: 'MyFontFamily';
+  font-family: 'MyFontFamily';
 }
 
 @font-face {
- font-family: 'MyFontFamily';
- src: url('myfont.woff2') format('woff2'),
-      url('myfont.woff')  format('woff');
+  font-family: 'MyFontFamily';
+  src: url('myfont.woff2') format('woff2'),
+  url('myfont.woff')  format('woff');
 }
 
 @font-face {

css-checks/src/test/resources/checks/common/properties/css/background-attachment.css

@@ -5,6 +5,6 @@
   background-attachment: local;
   background-attachment: local, fixed;
   background-attachment: local, fixed, fixed;
-  background-attachment: 10; /* Noncompliant !{Update the invalid value of property "background-attachment". Expected format: scroll | fixed | local [, scroll | fixed | local]*}! */
+  background-attachment: 10; /* Noncompliant !{Update the invalid value of property "background-attachment". Expected format: [ scroll | fixed | local ]#}! */
   background-attachment: 10, 10; /* Noncompliant */
 }

css-checks/src/test/resources/checks/common/properties/css/background-blend-mode.css

@@ -2,6 +2,7 @@
   background-blend-mode: inherit;
   background-blend-mode: normal;
   background-blend-mode: multiply;
+  background-blend-mode: multiply !important;
   background-blend-mode: screen;
   background-blend-mode: overlay;
   background-blend-mode: darken;
@@ -21,7 +22,7 @@
   background-blend-mode: 10; /* Noncompliant */
   background-blend-mode: normal, multiply;
   background-blend-mode: normal, multiply, multiply;
+  background-blend-mode: normal, multiply, multiply !important;
   background-blend-mode: normal, multiply, multiply, color-burn;
   background-blend-mode: normal, multiply, multiply, zzz; /* Noncompliant */
-  background-blend-mode: normal, multiply, , multiply; /* Noncompliant */
 }

css-checks/src/test/resources/checks/common/properties/css/background-clip.css

@@ -3,7 +3,7 @@
   background-clip: border-box;
   background-clip: padding-box;
   background-clip: content-box;
-  background-clip: 10px; /* Noncompliant !{Update the invalid value of property "background-clip". Expected format: <box> [, <box>]*}! */
+  background-clip: 10px; /* Noncompliant !{Update the invalid value of property "background-clip". Expected format: <box>#}! */
   background-clip: 10; /* Noncompliant */
   background-clip: border-box, padding-box
 

css-checks/src/test/resources/checks/common/properties/css/background-image.css

@@ -1,10 +1,12 @@
 .mybox {
   background-image: inherit;
   background-image: none;
+  background-image: none !important;
   background-image: url(http://mybox);
+  background-image: url(http://mybox) !important;
   background-image: url(http://mybox), url(http://mybox);
   background-image: url(http://mybox), url(http://mybox), url(http://mybox);
-  background-image: 10; /* Noncompliant !{Update the invalid value of property "background-image". Expected format: none | <image> [, <image>]*}! */
+  background-image: 10; /* Noncompliant !{Update the invalid value of property "background-image". Expected format: none | <image>#}! */
   background-image: 10, 10; /* Noncompliant */
   background-image: image();
   background-image: image-set();

css-checks/src/test/resources/checks/common/properties/css/background-origin.css

@@ -3,7 +3,7 @@
   background-origin: border-box;
   background-origin: padding-box;
   background-origin: content-box;
-  background-origin: 10px; /* Noncompliant !{Update the invalid value of property "background-origin". Expected format: <box> [, <box>]*}! */
+  background-origin: 10px; /* Noncompliant !{Update the invalid value of property "background-origin". Expected format: <box>#}! */
   background-origin: 10; /* Noncompliant */
   background-origin: border-box, padding-box