branch: master commit d41116808a101bdcfe5370d69142924b4b6cb2ad Author: Jackson Ray Hamilton <jack...@jacksonrayhamilton.com> Commit: Jackson Ray Hamilton <jack...@jacksonrayhamilton.com>
Revert to single var. --- .jslintrc | 5 ---- languages/javascript/.jslintrc | 4 +++ languages/javascript/bin/cli.js | 4 +- languages/javascript/scopifier.js | 41 +++++++++++++++++++------------------ 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.jslintrc b/.jslintrc deleted file mode 100644 index 52eea7e..0000000 --- a/.jslintrc +++ /dev/null @@ -1,5 +0,0 @@ -{ - "node": true, - "nomen": true, - "vars": true -} diff --git a/languages/javascript/.jslintrc b/languages/javascript/.jslintrc new file mode 100644 index 0000000..03c17c5 --- /dev/null +++ b/languages/javascript/.jslintrc @@ -0,0 +1,4 @@ +{ + "node": true, + "nomen": true +} diff --git a/languages/javascript/bin/cli.js b/languages/javascript/bin/cli.js index e439c67..1a059bc 100644 --- a/languages/javascript/bin/cli.js +++ b/languages/javascript/bin/cli.js @@ -4,8 +4,8 @@ 'use strict'; -var scopifier = require('../scopifier'); -var whole = ''; +var scopifier = require('../scopifier'), + whole = ''; process.stdin.setEncoding('utf8'); diff --git a/languages/javascript/scopifier.js b/languages/javascript/scopifier.js index a49d054..7a82570 100644 --- a/languages/javascript/scopifier.js +++ b/languages/javascript/scopifier.js @@ -1,7 +1,7 @@ 'use strict'; -var escope = require('./lib/escope'); -var esprima = require('./lib/esprima'); +var escope = require('./lib/escope'), + esprima = require('./lib/esprima'); // Given code, returns an array of tokens for context-coloring. function scopifier(code) { @@ -9,8 +9,23 @@ function scopifier(code) { // Strip BOM. code = code.replace(/^\ufeff/g, ''); - var ast; - var analyzedScopes; + var analyzedScopes, + ast, + comment, + definition, + definitionsCount, + definitionsIndex, + i, + isDefined, + j, + k, + pointer, + range, + reference, + scope, + scopes, + tokens, + variable; // Gracefully handle parse errors by doing nothing. try { @@ -23,21 +38,8 @@ function scopifier(code) { process.exit(1); } - 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; + scopes = []; + tokens = []; for (i = 0; i < analyzedScopes.length; i += 1) { scope = analyzedScopes[i]; // Having its level set implies it was already annotated. @@ -107,7 +109,6 @@ function scopifier(code) { } } - var comment; for (i = 0; i < ast.comments.length; i += 1) { comment = ast.comments[i]; range = comment.range;