Merge pull request #247 from ryym/sass-var-zeros

Format zeros in root scope Sass variables
masaakim · Dec 16, 2016 · b143de7 · b143de7
2 parents 86c43a6 + db7ba15
commit b143de7
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 0 deletions.
diff --git a/lib/formatSassVariables.js b/lib/formatSassVariables.js
@@ -1,5 +1,6 @@
 var formatTransforms = require('./formatTransforms')
 var formatColors = require('./formatColors')
+var formatZeros = require('./formatZeros')
 
 function formatSassVariables (root, params) {
   var stylelint = params.stylelint
@@ -45,6 +46,7 @@ function formatSassVariables (root, params) {
         decl.value = decl.value.trim().replace(/(\s+)?,(\s)*/g, ', ')
       }
 
+      decl.value = formatZeros(decl.value, stylelint)
       decl.value = formatColors(decl.value, stylelint)
       decl.value = formatTransforms(decl.value)
 

diff --git a/test/stylelint/length-zero-no-unit/length-zero-no-unit.css b/test/stylelint/length-zero-no-unit/length-zero-no-unit.css
@@ -1,3 +1,5 @@
+$var: 0px 10px;
+
 div {
   height: 0px;
   width: 10px;

diff --git a/test/stylelint/length-zero-no-unit/length-zero-no-unit.out.css b/test/stylelint/length-zero-no-unit/length-zero-no-unit.out.css
@@ -1,3 +1,5 @@
+$var: 0 10px;
+
 div {
   height: 0;
   width: 10px;

diff --git a/test/stylelint/number-leading-zero-always/number-leading-zero-always.css b/test/stylelint/number-leading-zero-always/number-leading-zero-always.css
@@ -1,3 +1,5 @@
+$var: .5 .8px;
+
 p {
   transition: .4s cubic-bezier(.23, 1, .32, 1);
   opacity: 0.5;

diff --git a/test/stylelint/number-leading-zero-always/number-leading-zero-always.out.css b/test/stylelint/number-leading-zero-always/number-leading-zero-always.out.css
@@ -1,3 +1,5 @@
+$var: 0.5 0.8px;
+
 p {
   transition: 0.4s cubic-bezier(0.23, 1, 0.32, 1);
   opacity: 0.5;

diff --git a/test/stylelint/number-leading-zero-never/number-leading-zero-never.css b/test/stylelint/number-leading-zero-never/number-leading-zero-never.css
@@ -1,3 +1,5 @@
+$var: 0.5 0.8px;
+
 p {
   line-height: 0.5;
   transition: 0.4s cubic-bezier(0.23, 1, 0.32, 1);

diff --git a/test/stylelint/number-leading-zero-never/number-leading-zero-never.out.css b/test/stylelint/number-leading-zero-never/number-leading-zero-never.out.css
@@ -1,3 +1,5 @@
+$var: .5 .8px;
+
 p {
   line-height: .5;
   transition: .4s cubic-bezier(.23, 1, .32, 1);

diff --git a/test/stylelint/number-no-trailing-zeros/number-no-trailing-zeros.css b/test/stylelint/number-no-trailing-zeros/number-no-trailing-zeros.css
@@ -1,3 +1,5 @@
+$var: 1.0 2.0px;
+
 p {
   top: 1.0px;
   line-height: 1.0;

diff --git a/test/stylelint/number-no-trailing-zeros/number-no-trailing-zeros.out.css b/test/stylelint/number-no-trailing-zeros/number-no-trailing-zeros.out.css
@@ -1,3 +1,5 @@
+$var: 1 2px;
+
 p {
   top: 1px;
   line-height: 1;