Fix #317: sort-order should not remove empty lines

Author: tonyganch

lib/options/sort-order.js

@@ -68,6 +68,14 @@ module.exports = {
         var j;
         var nl;
 
+        /**
+         * Remove empty lines in space node.
+         * @param {node} node Space node.
+         */
+        var removeEmptyLines = function(node) {
+            node[1] = node[1].replace(/\n[\s\t\n\r]*\n/, '\n');
+        };
+
         /**
          * Check if there are any comments or spaces before
          * the declaration/@-rule.
@@ -87,11 +95,6 @@ module.exports = {
                     return false;
                 }
 
-                // Remove any empty lines:
-                if (currentNode[0] === 's') {
-                    currentNode[1] = currentNode[1].replace(/\n[\s\t\n\r]*\n/, '\n');
-                }
-
                 // If the node is declaration or @-rule, stop and return all
                 // found nodes with spaces and comments (if there are any):
                 if (SC.indexOf(currentNode[0]) === -1) break;
@@ -125,11 +128,6 @@ module.exports = {
                 // If there is no node, or it is nor spaces neither comment, stop:
                 if (!currentNode || SC.indexOf(currentNode[0]) === -1) break;
 
-                // Remove any empty lines:
-                if (currentNode[0] === 's') {
-                    currentNode[1] = currentNode[1].replace(/\n[\s\t\n\r]*\n/, '\n');
-                }
-
                 if (['commentML', 'commentSL'].indexOf(currentNode[0]) > -1) {
                     sc.push(currentNode);
                     d.push(i + 1);
@@ -349,9 +347,9 @@ module.exports = {
                 var sc1 = currentNode.sc1;
                 var sc2 = currentNode.sc2;
 
-                sc0.reverse();
-                sc1.reverse();
-                sc2.reverse();
+                sc0.reverse().map(removeEmptyLines);
+                sc1.reverse().map(removeEmptyLines);
+                sc2.reverse().map(removeEmptyLines);
 
                 // Divide declarations from different groups with an empty line:
                 if (prevNode && currentNode.groupIndex > prevNode.groupIndex) {

test/options/sort-order-scss.js

@@ -113,4 +113,9 @@ describe('options/sort-order (scss)', function() {
         });
         this.shouldBeEqual('leftovers.scss', 'leftovers.expected.scss');
     });
+
+    it('Issue 317', function() {
+        this.comb.configure({ 'sort-order': ['...'] });
+        this.shouldBeEqual('issue-317.scss');
+    });
 });

test/options/sort-order-scss/issue-317.scss

@@ -0,0 +1,31 @@
+.tv-header-reminders {
+    display: inline-block;
+    position: relative;
+    vertical-align: top;
+ 
+    &__spin {
+        background-color: #fff;
+        display: none;
+        height: 100%;
+        left: 0;
+        position: absolute;
+        top: 0;
+        width: 100%;
+ 
+        .spin {
+            height: 100%;
+            text-align: center;
+        }
+ 
+        .spin__icon {
+            margin-top: 4px;
+        }
+    }
+ 
+    &_loading_yes .tv-header-reminders__spin {
+        display: block;
+ 
+ 
+    }
+ 
+}