Merge pull request #345 from varya/fixes/empty-comments

Allow empty single-line comments

Author: Juuso Backman

lib/modules/variable-parser.js

@@ -148,7 +148,9 @@ function setVariables(string, syntax, variables) {
   var ast, result, changeVariable;
 
   changeVariable = function(ast, key, value) {
-    return gonzo.traverse(ast, [{
+
+    var visitors = {
+      sass: {
         // Visitor for SASS and SCSS syntaxes
         test: function(name, nodes) {
           return name === 'declaration' && nodes[1][0] === 'variable' && nodes[1][1].indexOf(key) !== -1;
@@ -158,7 +160,7 @@ function setVariables(string, syntax, variables) {
           return node;
         }
       },
-      {
+      less: {
         // Visitor for LESS syntax
         test: function(name) {
           return name === 'atrules';
@@ -191,7 +193,10 @@ function setVariables(string, syntax, variables) {
           return node;
         }
       }
-    ]);
+    };
+    visitors.scss = visitors.sass;
+
+    return gonzo.traverse(ast, [visitors[syntax]]);
   };
 
   ast = gonzales.srcToAST({

package.json

@@ -35,7 +35,7 @@
     "debug": "~2.1.0",
     "event-stream": "^3.1.7",
     "express": "^4.10.4",
-    "gonzales-ast": "0.0.5",
+    "gonzales-ast": "0.0.6",
     "gonzales-pe": "^3.0.0-12",
     "gulp": "^3.8.10",
     "gulp-concat": "^2.4.2",

test/unit/modules/variable-parser.test.js

@@ -395,7 +395,27 @@ describe('Parser', function() {
         changed = parser.setVariables(str, 'scss', variables);
         expect(changed).eql(result);
       });
-
+      it('should preserve inline comments', function() {
+        var str = multiline(function() {
+          /*
+$mycolor: #00ff00;
+//
+$mypadding: 3px;
+          */
+          }),
+          variables = [
+            {name: 'mypadding', value: '0'}
+          ],
+          result = multiline(function() {
+          /*
+$mycolor: #00ff00;
+//
+$mypadding: 0;
+          */
+          }),
+          changed = parser.setVariables(str, 'scss', variables);
+        expect(changed).eql(result);
+      });
       it('should preserve comments', function() {
         var str = '' +
           '$mycolor: #00ff00;\n' +
@@ -481,7 +501,7 @@ describe('Parser', function() {
         changed = parser.setVariables(str, 'less', variables);
         expect(changed).eql(result);
       });
-      it('should preserve comments', function() {
+      it('should preserve multiline comments', function() {
         var str = '' +
           '@mycolor: #00ff00;\n' +
           '/* Comment */\n' +