Merge pull request #47 from pugjs/plugins

Add test to make sure all lexer functions are called with callLexerFunction

index.js

@@ -1178,7 +1178,7 @@ Lexer.prototype = {
     }
   },
 
-  pipelessText: function(indents) {
+  pipelessText: function pipelessText(indents) {
     while (this.callLexerFunction('blank'));
 
     var captures = this.scanIndentation();
@@ -1207,7 +1207,7 @@ Lexer.prototype = {
           // line is indented less than the first line but is still indented
           // need to retry lexing the text block
           this.tokens.pop();
-          return this.pipelessText(lineCaptures[1].length);
+          return pipelessText.call(this, lineCaptures[1].length);
         }
       } while((this.input.length - stringPtr) && isMatch);
       this.consume(stringPtr);

package.json

@@ -11,6 +11,7 @@
     "jade-error": "^1.0.0"
   },
   "devDependencies": {
+    "acorn": "^2.6.2",
     "istanbul": "^0.3.2"
   },
   "scripts": {

test/check-lexer-functions.js

@@ -0,0 +1,96 @@
+var fs = require('fs');
+var acorn = require('acorn');
+var walk = require('acorn/dist/walk');
+
+var hadErrors = false;
+
+var lexerFunctions = {
+  advance: true,
+  append: true,
+  attributesBlock: true,
+  attrs: true,
+  blank: true,
+  block: true,
+  blockCode: true,
+  call: true,
+  case: true,
+  className: true,
+  code: true,
+  colon: true,
+  comment: true,
+  conditional: true,
+  default: true,
+  doctype: true,
+  dot: true,
+  each: true,
+  eos: true,
+  endInterpolation: true,
+  extends: true,
+  filter: true,
+  id: true,
+  include: true,
+  indent: true,
+  interpolation: true,
+  mixin: true,
+  mixinBlock: true,
+  path: true,
+  pipelessText: true,
+  prepend: true,
+  slash: true,
+  tag: true,
+  text: true,
+  textHtml: true,
+  when: true,
+  while: true,
+  yield: true,
+};
+
+module.exports = function () {
+  var str = fs.readFileSync(__dirname + '/../index.js', 'utf8');
+  var ast = acorn.parse(str, {locations: true});
+  walk.simple(ast, {
+    CallExpression: function (node) {
+      checkDirectCalls(node);
+      checkMissingLexerFunction(node);
+    }
+  });
+  if (hadErrors) process.exit(1);
+};
+
+function checkDirectCalls (node) {
+  var callee = node.callee;
+  if (callee.type !== 'MemberExpression') return;
+  if (callee.object.type !== 'ThisExpression') return;
+  var property = callee.property;
+  var func;
+  if (callee.computed) {
+    if (property.type !== 'Literal') return;
+    func = property.value;
+  } else {
+    func = property.name;
+  }
+  if (!lexerFunctions[func]) return;
+  console.log('index.js:' + node.loc.start.line + ':' + node.loc.start.column + ': Lexer function ' + func + ' called directly');
+  hadErrors = true;
+}
+
+function checkMissingLexerFunction (node) {
+  var callee = node.callee;
+  if (callee.type !== 'MemberExpression') return;
+  if (callee.object.type !== 'ThisExpression') return;
+  var property = callee.property;
+  var func;
+  if (callee.computed) {
+    if (property.type !== 'Literal') return;
+    func = property.value;
+  } else {
+    func = property.name;
+  }
+  if (func !== 'callLexerFunction') return;
+  if (!node.arguments.length) return;
+  if (node.arguments[0].type !== 'Literal') return;
+  func = node.arguments[0].value;
+  if (lexerFunctions[func]) return;
+  console.log('index.js:' + node.loc.start.line + ':' + node.loc.start.column + ': Lexer function ' + func + ' not in lexerFunctions list');
+  hadErrors = true;
+}

test/index.js

@@ -3,6 +3,9 @@
 var fs = require('fs');
 var assert = require('assert');
 var lex = require('../');
+var checkLexerFunctions = require('./check-lexer-functions');
+
+checkLexerFunctions();
 
 var dir = __dirname + '/cases/';
 fs.readdirSync(dir).forEach(function (testCase) {