🐛 Fix operators in variable names

sasstools · Oct 22, 2016 · 36b3b8f · 36b3b8f
1 parent a66c707
commit 36b3b8f
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/lib/rules/variable-name-format.js b/lib/rules/variable-name-format.js
@@ -16,7 +16,9 @@ module.exports = {
     ast.traverseByType('variable', function (variable) {
       var strippedName,
           violationMessage = false,
-          name = variable.first().content;
+          // Gonzales would parse variable names with operators without this regex i.e. '$mobile-site-gutter*1'
+          name = variable.first().content.split(/(\*|\+|\/)/)[0];
+
 
       strippedName = name;
 

diff --git a/tests/rules/variable-name-format.js b/tests/rules/variable-name-format.js
@@ -27,7 +27,7 @@ describe('variable name format - scss', function () {
         }
       ]
     }, function (data) {
-      lint.assert.equal(15, data.warningCount);
+      lint.assert.equal(16, data.warningCount);
       done();
     });
   });
@@ -41,7 +41,7 @@ describe('variable name format - scss', function () {
         }
       ]
     }, function (data) {
-      lint.assert.equal(16, data.warningCount);
+      lint.assert.equal(17, data.warningCount);
       done();
     });
   });
@@ -55,7 +55,7 @@ describe('variable name format - scss', function () {
         }
       ]
     }, function (data) {
-      lint.assert.equal(10, data.warningCount);
+      lint.assert.equal(11, data.warningCount);
       done();
     });
   });
@@ -98,7 +98,7 @@ describe('variable name format - scss', function () {
         }
       ]
     }, function (data) {
-      lint.assert.equal(16, data.warningCount);
+      lint.assert.equal(17, data.warningCount);
       done();
     });
   });
@@ -143,7 +143,7 @@ describe('variable name format - sass', function () {
         }
       ]
     }, function (data) {
-      lint.assert.equal(15, data.warningCount);
+      lint.assert.equal(16, data.warningCount);
       done();
     });
   });
@@ -157,7 +157,7 @@ describe('variable name format - sass', function () {
         }
       ]
     }, function (data) {
-      lint.assert.equal(10, data.warningCount);
+      lint.assert.equal(11, data.warningCount);
       done();
     });
   });
@@ -171,7 +171,7 @@ describe('variable name format - sass', function () {
         }
       ]
     }, function (data) {
-      lint.assert.equal(16, data.warningCount);
+      lint.assert.equal(17, data.warningCount);
       done();
     });
   });
@@ -214,7 +214,7 @@ describe('variable name format - sass', function () {
         }
       ]
     }, function (data) {
-      lint.assert.equal(16, data.warningCount);
+      lint.assert.equal(17, data.warningCount);
       done();
     });
   });

diff --git a/tests/sass/variable-name-format.sass b/tests/sass/variable-name-format.sass
@@ -19,3 +19,7 @@ $_does_NOT-fitSTANDARD: 1
 
 .class
   width: $snake_case
+
+// Issue #901 - operators not recognized as separate tokens by gonzales-pe
+.content-main
+  padding: $mobile-site-gutter*1.5
diff --git a/tests/sass/variable-name-format.scss b/tests/sass/variable-name-format.scss
@@ -20,3 +20,8 @@ $_does_NOT-fitSTANDARD: 1;
 .class {
   width: $snake_case;
 }
+
+// Issue #901 - operators not recognized as separate tokens by gonzales-pe
+.content-main {
+  padding: $mobile-site-gutter*1.5;
+}