Merge pull request #180 from varya/features/gonzales-based-splitter

Gonzales based KSS splitter + more complex tests

Author: hannu

lib/modules/kss-splitter.js

@@ -1,61 +1,76 @@
 'use strict'
 
-var kssBlocksParser = require('./kss-blocks-parser').kssBlocksParser;
+var gonzales = require('gonzales-pe'),
+    gonzo = require('gonzales-ast');
 
 module.exports = {
 
   /* Split string source into array of code and comment blocks */
-  pureSplitter: function(source) {
-    var lines = source.split(/\n|$/g),
-      anInlineComment = /^ *\/\//,
-      multilineCommentStarted = /\/\*/,
-      multilineCommentFinished = /\*\//,
-      isMultilineCommentStarted,
-      blocks = [],
-      block,
-      type,
-      prevType;
-
-    lines.forEach(function(line) {
-
-      if (isMultilineCommentStarted) {
-        type = 'comment'
-        if (multilineCommentFinished.test(line)) {
-          isMultilineCommentStarted = false;
+  pureSplitter: function(source, syntax) {
+
+    syntax = syntax || 'scss';
+    var out = {},
+        ast = gonzales.srcToAST({
+          src: source,
+          syntax: syntax
+        }),
+        block,
+        blocks = [],
+        prevNode;
+
+    gonzo.traverse(ast, [{
+      // Visitor for SASS and SCSS syntaxes
+      test: function(name, nodes) {
+        return name !== 'stylesheet';
+      },
+      process: function(nodes) {
+        var startNewBlock = function() {
+          block && blocks.push(block);
+          block = {
+            type: '',
+            content: ''
+          };
+        },
+        type;
+
+        // Calculate type of the current block
+
+        // Multiline comment is comment
+        if (nodes[0] == 'commentML') {
+          type = 'comment';
         }
-      } else {
-        isMultilineCommentStarted = multilineCommentStarted.test(line);
-        if (isMultilineCommentStarted) {
-          type = 'comment'
-        } else {
-          type = anInlineComment.test(line) ? 'comment' : 'code';
+        // Singleline comment is comment
+        else if (nodes[0] === 'commentSL') {
+          type = 'comment';
         }
-      }
-
-      if (prevType != type) {
-        // Save old block if a new type appears
-        if (block) {
-          block.content = block.content.join('\n');
-          blocks.push(block);
+        // Single breaklines between singleline comments are comments
+        else if (nodes[0] === 's' && nodes[1].split('\n').length <= 2 && prevNode[0] === 'commentSL') {
+          type = 'comment';
         }
-        // Start a new block after changing the type
-        block = {
-          type: type,
-          content: [line]
+        else {
+          type = 'code';
         }
-      } else {
-        block.content.push(line);
-      }
 
-      prevType = type;
+        // If type has been changed, start a new block
+        if (!block || block.type != type) {
+          startNewBlock();
+        }
 
-    });
+        // Extend current block content
+        block.type = type;
+        block.content += gonzales.astToSrc({
+          ast: nodes,
+          syntax: syntax
+        });
+        prevNode = nodes;
 
-    // Push the last block
-    block.content = block.content.join('\n');
-    blocks.push(block);
+      }
+    }]);
 
+    // push last block
+    blocks.push(block);
     return blocks;
+
   },
 
   getBlocks: function(source) {
@@ -86,11 +101,9 @@ module.exports = {
           }
         } else {
           // Not KSS comments are considered to be parts of code
-          pair.code.push('\n')
           pair.code.push(block.content)
         }
       } else {
-        pair.code.push('\n')
         pair.code.push(block.content)
       }