Merge pull request #88 from DanPurdy/feature/mixin-bug-fix

Update mixin-before-declaration rule fix #80

Author: bgriffith

lib/rules/mixins-before-declarations.js

@@ -14,32 +14,34 @@ module.exports = {
     var result = [],
         error;
 
-    ast.traverseByType('block', function (block) {
-      var lastDeclaration = null;
-      block.traverse(function (item, j) {
-        if (item.type === 'include') {
-          if (j > lastDeclaration && lastDeclaration !== null) {
-            item.forEach('simpleSelector', function (name) {
-              if (parser.options.exclude.indexOf(name.content[0].content) === -1) {
-                error = {
-                  'ruleId': parser.rule.name,
-                  'line': item.start.line,
-                  'column': item.start.column,
-                  'message': 'Mixins should come before declarations',
-                  'severity': parser.severity
-                };
-                result = helpers.addUnique(result, error);
-              }
-            });
-          }
+    ast.traverseByType('include', function (node, i, parent) {
+      var depth = 0,
+          declarationCount = [depth];
+
+      parent.traverse( function (item) {
+        if (item.type === 'ruleset') {
+          depth++;
+          declarationCount[depth] = 0;
+        }
+        else if (item.type === 'declaration') {
+          declarationCount[depth]++;
         }
-        if (item.type === 'declaration') {
-          lastDeclaration = j;
+        else if (item.type === 'include') {
+          item.forEach('simpleSelector', function (name) {
+            if (parser.options.exclude.indexOf(name.content[0].content) === -1 && declarationCount[depth] > 0) {
+              error = {
+                'ruleId': parser.rule.name,
+                'line': item.start.line,
+                'column': item.start.column,
+                'message': 'Mixins should come before declarations',
+                'severity': parser.severity
+              };
+              result = helpers.addUnique(result, error);
+            }
+          });
         }
       });
-      lastDeclaration = null;
     });
-
     return result;
   }
 };

tests/main.js

@@ -194,11 +194,35 @@ describe('rule', function () {
   });
 
   //////////////////////////////
-  // Mixins Before DEclarations
+  // Mixins Before Declarations
   //////////////////////////////
   it('mixins before declarations', function (done) {
     lintFile('mixins-before-declarations.scss', function (data) {
-      assert.equal(4, data.warningCount);
+      assert.equal(5, data.warningCount);
+      done();
+    });
+  });
+
+  //////////////////////////////
+  // Mixins Before Declarations - overwrite
+  //////////////////////////////
+  it('mixins before declarations - excludes', function (done) {
+    lintFile('mixins-before-declarations.scss', {
+      'rules': {
+        'mixins-before-declarations': [
+          1,
+          {
+            'exclude': [
+              'test-again',
+              'waldo',
+              'mq',
+              'breakpoint'
+            ]
+          }
+        ]
+      }
+    }, function (data) {
+      assert.equal(0, data.warningCount);
       done();
     });
   });

tests/sass/mixins-before-declarations.scss

@@ -25,5 +25,25 @@
     content: 'where';
 
     @include waldo;
+
+  }
+
+  &__element {
+    @include element;
+    width: 100%;
+
+    @include mq(500px) {
+      content: 'mq';
+    }
+
+    @include waldo;
+
+    &--modifier {
+      @include foo('yo');
+      @include hello;
+      @include test;
+      height: 100px;
+      @include test-again;
+    }
   }
-}
+}