From e02afd570eede1d70d4d1949384d486ee3effe08 Mon Sep 17 00:00:00 2001 From: Jeff Williams Date: Mon, 21 Oct 2013 09:11:23 -0700 Subject: [PATCH] create parser, THEN attach plugins fixes broken test --- jsdoc.js | 7 +++---- test/specs/plugins/plugins.js | 4 ++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/jsdoc.js b/jsdoc.js index c888e842..fb44a411 100644 --- a/jsdoc.js +++ b/jsdoc.js @@ -204,10 +204,6 @@ function main() { process.exit(0); } - if (env.conf.plugins) { - jsdoc.plugins.installPlugins(env.conf.plugins, app.jsdoc.parser); - } - if (env.conf.source && env.conf.source.include) { env.opts._ = (env.opts._ || []).concat(env.conf.source.include); } @@ -232,6 +228,9 @@ function main() { (env.opts.recurse? 10 : undefined), filter); app.jsdoc.parser = jsdoc.src.parser.createParser(env.conf.parser); + if (env.conf.plugins) { + jsdoc.plugins.installPlugins(env.conf.plugins, app.jsdoc.parser); + } jsdoc.src.handlers.attachTo(app.jsdoc.parser); docs = app.jsdoc.parser.parse(sourceFiles, env.opts.encoding); diff --git a/test/specs/plugins/plugins.js b/test/specs/plugins/plugins.js index 2776105c..3b8398a6 100644 --- a/test/specs/plugins/plugins.js +++ b/test/specs/plugins/plugins.js @@ -4,6 +4,10 @@ describe("plugins", function() { var myGlobal = require('jsdoc/util/global'); myGlobal.jsdocPluginsTest = myGlobal.jsdocPluginsTest || {}; + if (!app.jsdoc.parser) { + app.jsdoc.parser = new ( require('jsdoc/src/parser') ).Parser(); + } + require('jsdoc/plugins').installPlugins(['test/fixtures/testPlugin1', 'test/fixtures/testPlugin2'], app.jsdoc.parser);