Sass: Includes can have both arguments and block

`@include nani() {color: tomato}` is a valid include

src/rules-sass.js

@@ -218,6 +218,8 @@
         else if (l = this.checkInclude4(i)) tokens[i].include_type = 4;
         else if (l = this.checkInclude5(i)) tokens[i].include_type = 5;
         else if (l = this.checkInclude6(i)) tokens[i].include_type = 6;
+        else if (l = this.checkInclude7(i)) tokens[i].include_type = 7;
+        else if (l = this.checkInclude8(i)) tokens[i].include_type = 8;
 
         return l;
     };
@@ -234,16 +236,75 @@
             case 4: return this.getInclude4();
             case 5: return this.getInclude5();
             case 6: return this.getInclude6();
+            case 7: return this.getInclude7();
+            case 8: return this.getInclude8();
         }
     };
 
+    /**
+     * Check if token is part of an included mixin like `+nani(foo) {...}`
+     * @param {Number} i Token's index number
+     * @returns {Number} Length of the include
+     */
+    sass.checkInclude5 = function(i) {
+        var start = i,
+        l;
+
+        if (tokens[i].type === TokenType.PlusSign) i++;
+        else return 0;
+
+        if (l = this.checkIncludeSelector(i)) i += l;
+        else return 0;
+
+        if (l = this.checkSC(i)) i += l;
+
+        if (l = this.checkArguments(i)) i += l;
+        else return 0;
+
+        if (l = this.checkSC(i)) i += l;
+
+        if (l = this.checkBlock(i)) i += l;
+        else return 0;
+
+        if (l = this.checkSC(i)) i += l;
+
+        return i - start;
+    };
+
+    /**
+     * Get node with included mixin like `+nani(foo) {...}`
+     * @returns {Array} `['include', ['operator', '+'], ['selector', x], sc,
+     *      ['arguments', y], sc, ['block', z], sc` where `x` is
+     *      mixin's identifier (selector), `y` are arguments passed to the
+     *      mixin, `z` is block passed to mixin and `sc` are optional whitespaces
+     */
+    sass.getInclude5 = function() {
+        var startPos = pos,
+            x = [NodeType.IncludeType];
+
+        x.push(this.getOperator());
+
+        x.push(this.getIncludeSelector());
+
+        x = x.concat(this.getSC());
+
+        x.push(this.getArguments());
+
+        x = x.concat(this.getSC());
+
+        x.push(this.getBlock());
+
+        x = x.concat(this.getSC());
+
+        return needInfo ? (x.unshift(getInfo(startPos)), x) : x;
+    };
 
     /**
      * Check if token is part of an included mixin like `+nani(foo)`
      * @param {Number} i Token's index number
      * @returns {Number} Length of the include
      */
-    sass.checkInclude4 = function(i) {
+    sass.checkInclude6 = function(i) {
         var start = i,
         l;
 
@@ -270,7 +331,7 @@
      *      mixin's identifier (selector), `z` are arguments passed to the
      *      mixin and `sc` are optional whitespaces
      */
-    sass.getInclude4 = function() {
+    sass.getInclude6 = function() {
         var startPos = pos,
             x = [NodeType.IncludeType];
 
@@ -293,7 +354,7 @@
      * @param {Number} i Token's index number
      * @returns {Number} Length of the mixin
      */
-    sass.checkInclude5 = function(i) {
+    sass.checkInclude7 = function(i) {
         var start = i,
             l;
 
@@ -318,7 +379,7 @@
      *      as an argument (e.g. `+nani {...}`)
      * @returns {Array} `['include', x]`
      */
-    sass.getInclude5 = function() {
+    sass.getInclude7 = function() {
         var startPos = pos,
             x = [NodeType.IncludeType];
 
@@ -339,7 +400,7 @@
      * @param {Number} i Token's index number
      * @returns {Number}
      */
-    sass.checkInclude6 = function(i) {
+    sass.checkInclude8 = function(i) {
         var start = i,
             l;
 
@@ -357,7 +418,7 @@
     /**
      * @returns {Array} `['include', x]`
      */
-    sass.getInclude6 = function() {
+    sass.getInclude8 = function() {
         var startPos = pos,
             x = [NodeType.IncludeType];
 

src/rules-scss.js

@@ -475,6 +475,7 @@
         if (l = this.checkInclude1(i)) tokens[i].include_type = 1;
         else if (l = this.checkInclude2(i)) tokens[i].include_type = 2;
         else if (l = this.checkInclude3(i)) tokens[i].include_type = 3;
+        else if (l = this.checkInclude4(i)) tokens[i].include_type = 4;
 
         return l;
     };
@@ -488,11 +489,12 @@
             case 1: return this.getInclude1();
             case 2: return this.getInclude2();
             case 3: return this.getInclude3();
+            case 4: return this.getInclude4();
         }
     };
 
     /**
-     * Check if token is part of an included mixin like `@include nani(foo)`
+     * Check if token is part of an included mixin like `@include nani(foo) {...}`
      * @param {Number} i Token's index number
      * @returns {Number} Length of the include
      */
@@ -519,6 +521,73 @@
 
         if (l = this.checkSC(i)) i += l;
 
+        if (l = this.checkBlock(i)) i += l;
+        else return 0;
+
+        if (l = this.checkSC(i)) i += l;
+
+        return i - start;
+    };
+
+    /**
+     * Get node with included mixin like `@include nani(foo) {...}`
+     * @returns {Array} `['include', ['atkeyword', x], sc, ['selector', y], sc,
+     *      ['arguments', z], sc, ['block', q], sc` where `x` is `include` or
+     *      `extend`, `y` is mixin's identifier (selector), `z` are arguments
+     *      passed to the mixin, `q` is block passed to the mixin and `sc`
+     *      are optional whitespaces
+     */
+    scss.getInclude1 = function() {
+        var startPos = pos,
+            x = [NodeType.IncludeType];
+
+        x.push(this.getAtkeyword());
+
+        x = x.concat(this.getSC());
+
+        x.push(this.getIncludeSelector());
+
+        x = x.concat(this.getSC());
+
+        x.push(this.getArguments());
+
+        x = x.concat(this.getSC());
+
+        x.push(this.getBlock());
+
+        x = x.concat(this.getSC());
+
+        return needInfo ? (x.unshift(getInfo(startPos)), x) : x;
+    };
+
+    /**
+     * Check if token is part of an included mixin like `@include nani(foo)`
+     * @param {Number} i Token's index number
+     * @returns {Number} Length of the include
+     */
+    scss.checkInclude2 = function(i) {
+        var start = i,
+        l;
+
+        if (l = this.checkAtkeyword(i)) i += l;
+        else return 0;
+
+        // TODO: Check if extends don't take any arguments
+        if (['include', 'extend'].indexOf(tokens[start + 1].value) < 0) return 0;
+
+        if (l = this.checkSC(i)) i += l;
+        else return 0;
+
+        if (l = this.checkIncludeSelector(i)) i += l;
+        else return 0;
+
+        if (l = this.checkSC(i)) i += l;
+
+        if (l = this.checkArguments(i)) i += l;
+        else return 0;
+
+        if (l = this.checkSC(i)) i += l;
+
         return i - start;
     };
 
@@ -529,7 +598,7 @@
      *      mixin's identifier (selector), `z` are arguments passed to the
      *      mixin and `sc` are optional whitespaces
      */
-    scss.getInclude1 = function() {
+    scss.getInclude2 = function() {
         var startPos = pos,
             x = [NodeType.IncludeType];
 
@@ -554,7 +623,7 @@
      * @param {Number} i Token's index number
      * @returns {Number} Length of the mixin
      */
-    scss.checkInclude2 = function(i) {
+    scss.checkInclude3 = function(i) {
         var start = i,
             l;
 
@@ -584,7 +653,7 @@
      *      as an argument (e.g. `@include nani {...}`)
      * @returns {Array} `['include', x]`
      */
-    scss.getInclude2 = function() {
+    scss.getInclude3 = function() {
         var startPos = pos,
             x = [NodeType.IncludeType];
 
@@ -607,7 +676,7 @@
      * @param {Number} i Token's index number
      * @returns {Number}
      */
-    scss.checkInclude3 = function(i) {
+    scss.checkInclude4 = function(i) {
         var start = i,
             l;
 
@@ -630,7 +699,7 @@
     /**
      * @returns {Array} `['include', x]`
      */
-    scss.getInclude3 = function() {
+    scss.getInclude4 = function() {
         var startPos = pos,
             x = [NodeType.IncludeType];
 

test/sass/include/10.l

@@ -0,0 +1,2 @@
+@include nani(foo)
+  p:v

test/sass/include/10.p

@@ -0,0 +1,18 @@
+['include',
+  ['atkeyword',
+    ['ident', 'include']],
+  ['s', ' '],
+  ['simpleselector',
+    ['ident', 'nani']],
+  ['arguments',
+    ['ident', 'foo']],
+  ['s', '
+'],
+  ['block',
+    ['s', '  '],
+    ['declaration',
+      ['property',
+        ['ident', 'p']],
+      ['propertyDelim'],
+      ['value',
+        ['ident', 'v']]]]]

test/sass/include/10.sass

@@ -0,0 +1,2 @@
+@include nani(foo)
+  p:v

test/sass/include/11.l

@@ -0,0 +1,2 @@
++nani(foo)
+  p:v

test/sass/include/11.p

@@ -0,0 +1,16 @@
+['include',
+  ['operator', '+'],
+  ['simpleselector',
+    ['ident', 'nani']],
+  ['arguments',
+    ['ident', 'foo']],
+  ['s', '
+'],
+  ['block',
+    ['s', '  '],
+    ['declaration',
+      ['property',
+        ['ident', 'p']],
+      ['propertyDelim'],
+      ['value',
+        ['ident', 'v']]]]]

test/sass/include/11.sass

@@ -0,0 +1,2 @@
++nani(foo)
+  p:v

test/scss/include/6.l

@@ -0,0 +1 @@
+@include nani() {p:v}

test/scss/include/6.p

@@ -0,0 +1,15 @@
+['include',
+  ['atkeyword',
+    ['ident', 'include']],
+  ['s', ' '],
+  ['simpleselector',
+    ['ident', 'nani']],
+  ['arguments'],
+  ['s', ' '],
+  ['block',
+    ['declaration',
+      ['property',
+        ['ident', 'p']],
+      ['propertyDelim'],
+      ['value',
+        ['ident', 'v']]]]]

test/scss/include/6.scss

@@ -0,0 +1 @@
+@include nani() {p:v}