jal-semicolon-fix: reversed parsing of semicolon after mixin without body fix

Author: jeffal

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.15.0
+* reversed parsing of semicolon after mixin without body fix
+
 ## 0.14.0
 * fixed parsing of semicolon after mixin without body
 

lib/less-parser.js

@@ -225,57 +225,5 @@ export default class LessParser extends Parser {
         this.unknownWord(start);
     }
 
-    /* eslint-enable max-statements */
-
-    loop () {
-        while (this.pos < this.tokens.length) {
-            const token = this.tokens[this.pos];
-
-            switch (token[0]) {
-                case 'word':
-                case ':':
-                    this.word();
-                    break;
-
-                case '}':
-                    this.end(token);
-                    break;
-
-                case 'comment':
-                    this.comment(token);
-                    break;
-
-                case 'at-word':
-                    this.atrule(token);
-                    break;
-
-                case '{':
-                    this.emptyRule(token);
-                    break;
-
-                case ';':
-                    {
-                        const lastNode = this.current && this.current.last;
-    
-                        // mark semicolon, but don't save it
-                        if (lastNode && lastNode.ruleWithoutBody) {
-                            lastNode.raws.semicolon = true;
-                        } else {
-                            this.spaces += token[1];
-                        }
-    
-                        break;
-                    }
-                default:
-                    this.spaces += token[1];
-                    break;
-            }
-
-            this.pos += 1;
-        }
-
-        this.endFile();
-    }
-
-    /* eslint-enable complexity */
-}
+    /* eslint-enable max-statements, complexity */
+}

test/postcss.spec.js

@@ -19,29 +19,16 @@ describe('#postcss', () => {
                 done();
             }).catch(done);
     });
+    
+    it('can parse LESS mixins as at rules', (done) => {
+        const lessText = '.foo (@bar; @baz...) { border: @{baz}; }';
 
-    it('can parse LESS mixins without body', (done) => {
-        const lessText = `.test4 {
-                            .mixin();
-                            background: red;
-                        }`;
-        
         postcss()
             .process(lessText, {syntax: lessSyntax})
             .then((result) => {
-                const [rule, declaration] = result.root.first.nodes;
-                
-                expect(rule.raws).to.deep.equal({
-                    before: '\n                            ',
-                    between: '',
-                    after: '',
-                    semicolon: true
-                });
-
-                expect(declaration.raws).to.deep.equal({
-                    before: '\n                            ',
-                    between: ': '
-                });
+                expect(result).to.be.not.null;
+                expect(result.css).to.equal(lessText);
+                expect(result.content).to.equal(lessText);
 
                 done();
             }).catch(done);

test/stringify.spec.js

@@ -60,7 +60,7 @@ describe('#stringify()', () => {
                 syntax: postcssLess,
                 stringifier: stringify
             }).then((result) => {
-                expect(result.content).to.eql('.selector:extend(.f, .g)  {&:extend(.a)}');
+                expect(result.content).to.eql(less);
                 done();
             }).catch((error) => {
                 done(error);
@@ -103,33 +103,17 @@ describe('#stringify()', () => {
                         width: @width;
                     }
                 }
-                                
+
                 .rotation(@deg:5deg){
                   .transform(rotate(@deg));
                 }
             `;
-            
-            function prepareOutput (str) {
-                return str.replace(/\s{2,}/g, ' ');
-            }
 
             postcss().process(less, {
                 syntax: postcssLess,
                 stringifier: stringify
             }).then((result) => {
-                expect(prepareOutput(result.content)).to.eql(prepareOutput(`
-                    .container {
-                        .mixin-1()
-                        .mixin-2
-                        .mixin-3 (@width: 100px) {
-                            width: @width;
-                        }
-                    }
-                                    
-                    .rotation(@deg:5deg){
-                      .transform(rotate(@deg))
-                    }
-                `));
+                expect(result.content).to.eql(less);
                 done();
             }).catch((error) => {
                 done(error);