Sort order: Handle properties preceeding rulesets

Previously, if a property-value pair was followed by a linebreak and anything
but property, import or include (e.g. ruleset or condition),
the pair appeared twice in the result code.
For example,
    a {
        color: tomato;
        span {foo: bar}}
would become:
    a {
        color: tomato;
        color: tomato;
        span {foo: bar}}
That was due to incorrect removal of spaces form `deleted` array.
This commit fixes the issue.

Author: tonyganch

lib/options/sort-order.js

@@ -223,6 +223,8 @@ module.exports = {
                 }
             }
 
+            // If current node is not property-value pair or import or include,
+            // skip it and continue with the next node:
             if (!propertyName) {
                 deleted.splice(deleted.length - sc0.length, deleted.length + 1);
                 continue;

test/sort-order-scss.js

@@ -16,7 +16,19 @@ describe('options/sort-order (scss)', function() {
         comb = new Comb();
     });
 
-    it('Should sort properties inside rules', function() {
+    it('Should sort properties inside rules (single line)', function() {
+        config = { 'sort-order': [
+            ['top', 'color']
+        ] };
+
+        input = readFile('rule.scss');
+        expected = readFile('rule.expected.scss');
+
+        comb.configure(config);
+        assert.equal(comb.processString(input, 'scss'), expected);
+    });
+
+    it('Should sort properties inside rules (multiple lines)', function() {
         config = { 'sort-order': [
             ['top', 'color']
         ] };
@@ -147,4 +159,28 @@ describe('options/sort-order (scss)', function() {
         comb.configure(config);
         assert.equal(comb.processString(input, 'scss'), expected);
     });
+
+    it('Should handle properties preceeding rulesets', function() {
+        config = { 'sort-order': [
+            ['top', 'left', 'color']
+        ] };
+
+        input = readFile('ruleset.scss');
+        expected = readFile('ruleset.expected.scss');
+
+        comb.configure(config);
+        assert.equal(comb.processString(input, 'scss'), expected);
+    });
+
+    it('Should handle properties preceeding conditions', function() {
+        config = { 'sort-order': [
+            ['font-size', 'display', 'top', 'color']
+        ] };
+
+        input = readFile('condition.scss');
+        expected = readFile('condition.expected.scss');
+
+        comb.configure(config);
+        assert.equal(comb.processString(input, 'scss'), expected);
+    });
 });

test/sort-order-scss/condition.expected.scss

@@ -0,0 +1,8 @@
+div {
+    top: 0;
+    color: tomato;
+    @if @color == tomato {
+        font-size: 2px;
+        display: block;
+        }
+    }

test/sort-order-scss/condition.scss

@@ -0,0 +1,8 @@
+div {
+    color: tomato;
+    @if @color == tomato {
+        display: block;
+        font-size: 2px;
+        }
+    top: 0;
+    }

test/sort-order-scss/rule-multiline.expected.scss

@@ -0,0 +1,4 @@
+div {
+    top: 0;
+    color: tomato;
+    }

test/sort-order-scss/rule-multiline.scss

@@ -0,0 +1,4 @@
+div {
+    color: tomato;
+    top: 0;
+    }

test/sort-order-scss/ruleset.expected.scss

@@ -0,0 +1,8 @@
+div {
+    left: 0;
+    color: tomato;
+    a {
+        top: 0;
+        color: nani;
+    }
+}

test/sort-order-scss/ruleset.scss

@@ -0,0 +1,8 @@
+div {
+    color: tomato;
+    a {
+        color: nani;
+        top: 0;
+    }
+    left: 0;
+}