branch: master commit fe2bd046c951276ca2b8fb2fd2b86491ba848188 Author: Jackson Ray Hamilton <jack...@jacksonrayhamilton.com> Commit: Jackson Ray Hamilton <jack...@jacksonrayhamilton.com>
Multiple vars. --- bin/cli.js | 4 ++-- scopifier.js | 41 ++++++++++++++++++++--------------------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/bin/cli.js b/bin/cli.js index 1a059bc..e439c67 100644 --- a/bin/cli.js +++ b/bin/cli.js @@ -4,8 +4,8 @@ 'use strict'; -var scopifier = require('../scopifier'), - whole = ''; +var scopifier = require('../scopifier'); +var whole = ''; process.stdin.setEncoding('utf8'); diff --git a/scopifier.js b/scopifier.js index 4bc380b..404cebe 100644 --- a/scopifier.js +++ b/scopifier.js @@ -1,31 +1,17 @@ 'use strict'; -var escope = require('./lib/escope'), - esprima = require('./lib/esprima'); +var escope = require('./lib/escope'); +var esprima = require('./lib/esprima'); // Given code, returns an array of tokens for context-coloring. module.exports = function (code) { - var analyzedScopes, - ast, - comment, - definition, - definitionsCount, - definitionsIndex, - i, - isDefined, - j, - k, - pointer, - range, - reference, - scope, - scopes, - tokens, - variable; // Strip BOM. code = code.replace(/^\ufeff/g, ''); + var ast; + var analyzedScopes; + // Gracefully handle parse errors by doing nothing. try { ast = esprima.parse(code, { @@ -37,9 +23,21 @@ module.exports = function (code) { process.exit(1); } - scopes = []; - tokens = []; + var scopes = []; + var tokens = []; + var definition; + var definitionsCount; + var definitionsIndex; + var i; + var isDefined; + var j; + var k; + var pointer; + var range; + var reference; + var scope; + var variable; for (i = 0; i < analyzedScopes.length; i += 1) { scope = analyzedScopes[i]; // Having its level set implies it was already annotated. @@ -109,6 +107,7 @@ module.exports = function (code) { } } + var comment; for (i = 0; i < ast.comments.length; i += 1) { comment = ast.comments[i]; range = comment.range;