Merge branch 'bugs/newlines'

pugjs · Oct 4, 2010 · 18d2713 · 18d2713
2 parents 95c0a73 + 25d6dae
commit 18d2713
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 21 deletions.
diff --git a/examples/layout.js b/examples/layout.js
@@ -5,7 +5,7 @@
 
 var jade = require('./../lib/jade');
 
-jade.renderFile(__dirname + '/layout.jade', {debug:true},function(err, html){
+jade.renderFile(__dirname + '/layout.jade', function(err, html){
     if (err) throw err;
     console.log(html);
 });
diff --git a/examples/whitespace.jade b/examples/whitespace.jade
@@ -0,0 +1,11 @@
+- var js = '<script></script>'
+!!! 5
+html
+
+  head
+    title= "Some " + "JavaScript"
+    != js
+
+
+
+  body    
diff --git a/examples/whitespace.js b/examples/whitespace.js
@@ -0,0 +1,11 @@
+
+/**
+ * Module dependencies.
+ */
+
+var jade = require('./../lib/jade');
+
+jade.renderFile(__dirname + '/whitespace.jade', {debug:true},function(err, html){
+    if (err) throw err;
+    console.log(html);
+});
diff --git a/lib/jade.js b/lib/jade.js
@@ -18,7 +18,7 @@ var Parser = require('./parser'),
  * Library version.
  */
 
-exports.version = '0.5.0';
+exports.version = '0.5.1';
 
 /**
  * Intermediate JavaScript cache.

diff --git a/lib/lexer.js b/lib/lexer.js
@@ -268,15 +268,14 @@ Lexer.prototype = {
             var tok = this.tok('indent', captures[1]),
                 indents = tok.val.length / 2;
             if (this.input[0] === '\n') {
-                tok.type = 'newline';
-                return tok;
+                return this.next;
             } else if (indents % 1 !== 0) {
                 throw new Error('Invalid indentation, got '
                     + tok.val.length + ' space' 
                     + (tok.val.length > 1 ? 's' : '') 
                     + ', must be a multiple of two.');
             } else if (indents === this.lastIndents) {
-                tok.type = 'newline';
+                return this.next;
             } else if (indents > this.lastIndents + 1) {
                 throw new Error('Invalid indentation, got ' 
                     + indents + ' expected ' 

diff --git a/lib/parser.js b/lib/parser.js
@@ -143,7 +143,6 @@ Parser.prototype = {
      * | text
      * | each
      * | code
-     * | newline
      * | id
      * | class
      */
@@ -164,9 +163,6 @@ Parser.prototype = {
                 return this.parseEach();
             case 'code':
                 return this.parseCode();
-            case 'newline':
-                this.advance;
-                return this.parseExpr();
             case 'id':
             case 'class':
                 var tok = this.advance;
@@ -253,19 +249,15 @@ Parser.prototype = {
     },
 
     /**
-     * indent (text | newline)* outdent
+     * indent text* outdent
      */
 
     parseTextBlock: function(){
         var text = new nodes.Text;
         text.line = this.line;
         this.expect('indent');
-        while (this.peek.type === 'text' || this.peek.type === 'newline') {
-            if (this.peek.type === 'newline') {
-                this.advance;
-            } else {
-                text.push(this.advance.val);
-            }
+        while (this.peek.type === 'text') {
+            text.push(this.advance.val);
         }
         this.expect('outdent');
         return text;
@@ -287,7 +279,7 @@ Parser.prototype = {
     },
 
     /**
-     * tag (attrs | class | id)* (text | code)? newline* block?
+     * tag (attrs | class | id)* (text | code)? block?
      */
 
     parseTag: function(){
@@ -328,9 +320,6 @@ Parser.prototype = {
                 break;
         }
 
-        // newline*
-        while (this.peek.type === 'newline') this.advance;
-
         // block?
         if (this.peek.type === 'indent') {
             var block = this.parseBlock();

diff --git a/test/filters.test.js b/test/filters.test.js
@@ -8,7 +8,6 @@ var jade = require('jade'),
     render = jade.render,
     nodes = jade.nodes;
 
-
 jade.filters.conditionals = function(block, compiler){
     return new Visitor(block).compile();
 };

diff --git a/test/jade.test.js b/test/jade.test.js
@@ -249,6 +249,28 @@ module.exports = {
         ].join('');
 
         assert.equal(html, render(str));
+
+        var str = [
+            'html',
+            ' ',
+            '  head',
+            '    != "test"',
+            '  ',
+            '  ',
+            '  ',
+            '  body'
+        ].join('\n');
+
+        var html = [
+            '<html>',
+            '<head>',
+            'test',
+            '</head>',
+            '<body></body>',
+            '</html>'
+        ].join('');
+
+        assert.equal(html, render(str));
     },
 
     'test cache': function(assert){