Merge pull request #203 from bgriffith/hotfix/fix-sass-extend-before-…

…mixin-master Hotfix master - Fix Sass extends-before-mixins bug
sasstools · Sep 22, 2015 · 97403b4 · 97403b4
2 parents 152c95b + 9f3c423
commit 97403b4
Showing 1 changed file with 23 additions and 10 deletions.
diff --git a/lib/rules/extends-before-mixins.js b/lib/rules/extends-before-mixins.js
@@ -10,22 +10,35 @@ module.exports = {
 
     ast.traverseByType('block', function (block) {
       var lastMixin = null;
-      block.traverse(function (item, j) {
-        if (item.type === 'extend') {
-          if (j > lastMixin && lastMixin !== null) {
-            result = helpers.addUnique(result, {
-              'ruleId': parser.rule.name,
-              'line': item.start.line,
-              'column': item.start.column,
-              'message': 'Extends should come before mixins',
-              'severity': parser.severity
-            });
+
+      block.forEach(function (item, j) {
+        if (item.type === 'include' || item.type === 'extend') {
+          if (item.first('atkeyword')) {
+            var atkeyword = item.first('atkeyword');
+
+            if (atkeyword.first('ident')) {
+              var ident = atkeyword.first('ident');
+
+              if (ident.content === 'extend') {
+                if (j > lastMixin && lastMixin !== null) {
+                  result = helpers.addUnique(result, {
+                    'ruleId': parser.rule.name,
+                    'line': item.start.line,
+                    'column': item.start.column,
+                    'message': 'Extends should come before mixins',
+                    'severity': parser.severity
+                  });
+                }
+              }
+            }
           }
         }
+
         if (item.type === 'include') {
           lastMixin = j;
         }
       });
+
       lastMixin = null;
     });