Merge pull request #733 from varya/features/extend-in-less

Support extends in LESS with newest Gonzales-PE (Fix #726)

Author: hannu

lib/modules/kss-splitter.js

@@ -55,8 +55,7 @@ module.exports = {
         }
         // Extend current block content
         block.type = type;
-        block.content += nodes.toCSS(syntax);
-        //console.log(block.content);
+        block.content += nodes.toString(syntax);
         prevNode = nodes;
       }
     }]);

lib/modules/parsers/less.js

@@ -33,7 +33,7 @@ function parseVariableDeclarations(string) {
               if (element.type === 'operator' && element.content === ':') {
                 return;
               }
-              varVal += element.toCSS('less'); // Syntax is always less as this visitor is only for LESS
+              varVal += element.toString('less'); // Syntax is always less as this visitor is only for LESS
             });
 
             out.push({
@@ -118,7 +118,7 @@ function setVariables(string, variables) {
       }
     });
   });
-  return ast.toCSS('less');
+  return ast.toString('less');
 }
 
 module.exports = {

lib/modules/parsers/scss.js

@@ -27,7 +27,7 @@ function parseVariableDeclarations(string) {
           if (nodes.content[3]) {
             out.push({
               name: varName,
-              value: nodes.content[3].toCSS(syntax),
+              value: nodes.content[3].toString(syntax),
               line: nodes.content[3].start.line
             });
           }
@@ -85,7 +85,7 @@ function setVariables(string, variables) {
     });
   });
 
-  return ast.toCSS(syntax);
+  return ast.toString(syntax);
 }
 
 module.exports = {

package.json

@@ -36,7 +36,7 @@
     "css": "~2.2.0",
     "express": "~4.13.0",
     "fs-extra": "^0.20.0",
-    "gonzales-pe": "3.0.0-29",
+    "gonzales-pe": "3.0.0-31",
     "gulp": "~3.9.0",
     "gulp-concat": "~2.5.2",
     "gulp-mustache": "~1.0.2",

test/unit/vendors/gonzales.test.js

@@ -66,6 +66,30 @@ $a: cell((1.75));
     });
   });
 
+  describe('LESS', function() {
+
+    it('should parse extends', function() {
+      var str = multiline(function() {
+        /*
+.animal {
+  background-color: black;
+  color: white;
+}
+.bear {
+  &:extend(.animal);
+  background-color: brown;
+}
+        */
+      });
+
+      ast = gonzales.parse(str, {
+        syntax: 'less'
+      });
+      expect(ast).to.be.an('object');
+    });
+
+  });
+
   it('should return error message with invalid syntax', function(done) {
     var invalid = '$a = foo', msg;
     try {