Fix #29 Add missing SCSS modulo operator (%)

racodond · Jun 6, 2017 · 6067ccd · 6067ccd
1 parent b9ce45e
commit 6067ccd
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/css-frontend/src/main/java/org/sonar/css/parser/LexicalGrammar.java b/css-frontend/src/main/java/org/sonar/css/parser/LexicalGrammar.java
@@ -643,6 +643,7 @@ private static void scss(LexerlessGrammarBuilder b) {
           "-",
           "/",
           "*",
+          "%",
           "==",
           "!=",
           "=",

diff --git a/css-frontend/src/main/java/org/sonar/css/parser/scss/ScssGrammar.java b/css-frontend/src/main/java/org/sonar/css/parser/scss/ScssGrammar.java
@@ -77,7 +77,6 @@ public Tree ANY() {
         BRACKET_BLOCK(),
         URI(),
         FUNCTION(),
-        PSEUDO_SELECTOR(),
         PERCENTAGE(),
         DIMENSION(),
         NUMBER(),
@@ -109,7 +108,6 @@ public Tree ANY_WITHOUT_COMMA_SEPARATED_LIST() {
         BRACKET_BLOCK(),
         URI(),
         FUNCTION(),
-        PSEUDO_SELECTOR(),
         PERCENTAGE(),
         DIMENSION(),
         NUMBER(),

diff --git a/css-frontend/src/main/java/org/sonar/plugins/css/api/tree/scss/ScssOperatorTree.java b/css-frontend/src/main/java/org/sonar/plugins/css/api/tree/scss/ScssOperatorTree.java
@@ -35,6 +35,7 @@ enum OPERATOR {
     MINUS("-"),
     TIMES("*"),
     DIV("/"),
+    MODULO("%"),
     EQUALS("="),
     DOUBLE_EQUALS("=="),
     NOT_EQUALS("!="),

diff --git a/css-frontend/src/test/java/org/sonar/css/parser/scss/ScssOperatorTreeTest.java b/css-frontend/src/test/java/org/sonar/css/parser/scss/ScssOperatorTreeTest.java
@@ -59,9 +59,9 @@ public void scssOperator() {
     assertThat(tree.type()).isEqualTo(ScssOperatorTree.OPERATOR.OR);
     assertThat(tree.operator().text()).isEqualTo("or");
 
-    tree = checkParsed(" or");
-    assertThat(tree.type()).isEqualTo(ScssOperatorTree.OPERATOR.OR);
-    assertThat(tree.operator().text()).isEqualTo("or");
+    tree = checkParsed(" %");
+    assertThat(tree.type()).isEqualTo(ScssOperatorTree.OPERATOR.MODULO);
+    assertThat(tree.operator().text()).isEqualTo("%");
   }
 
   @Test

diff --git a/css-frontend/src/test/java/org/sonar/css/parser/scss/ScssVariableDeclarationTreeTest.java b/css-frontend/src/test/java/org/sonar/css/parser/scss/ScssVariableDeclarationTreeTest.java
@@ -64,6 +64,8 @@ public void scssVariableDeclaration() {
       "  lg: $grid-gutter-width-base,\n" +
       "  xl: $grid-gutter-width-base\n" +
       ") !default;");
+
+    checkParsed(" $abc: ($top + $bot) % $component-space");
   }
 
   @Test