[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master d411168 175/271: Revert to single var.
From: |
Jackson Ray Hamilton |
Subject: |
[elpa] master d411168 175/271: Revert to single var. |
Date: |
Thu, 05 Feb 2015 18:30:58 +0000 |
branch: master
commit d41116808a101bdcfe5370d69142924b4b6cb2ad
Author: Jackson Ray Hamilton <address@hidden>
Commit: Jackson Ray Hamilton <address@hidden>
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;
- [elpa] master 665a54a 167/271: Add more js-mode tests., (continued)
- [elpa] master 665a54a 167/271: Add more js-mode tests., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 43f2e3b 168/271: Increase reliability of async tests., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 28183e4 188/271: Readme., Jackson Ray Hamilton, 2015/02/05
- [elpa] master bdfdbe4 151/271: Improve benchmarks., Jackson Ray Hamilton, 2015/02/05
- [elpa] master d27f2fe 182/271: Fix callback removal., Jackson Ray Hamilton, 2015/02/05
- [elpa] master cb0644a 136/271: Cleanup JavaScript tests., Jackson Ray Hamilton, 2015/02/05
- [elpa] master c1e9226 171/271: Reorganize lib., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 9e14226 135/271: Merge branch 'feature/language-generalization' into develop, Jackson Ray Hamilton, 2015/02/05
- [elpa] master 7473cc9 169/271: Improve documentation and error handling for async tests., Jackson Ray Hamilton, 2015/02/05
- [elpa] master b468d1c 166/271: Improve block scope test. Rename and document block scope variable., Jackson Ray Hamilton, 2015/02/05
- [elpa] master d411168 175/271: Revert to single var.,
Jackson Ray Hamilton <=
- [elpa] master 4c5f3ab 145/271: Fix first-run bug, passing js2-mode test., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 15bfad7 165/271: Renames., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 4d73262 152/271: Speed up local name lookup., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 4fee39d 174/271: Remove .jslintrc files., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 903d938 176/271: Update readme., Jackson Ray Hamilton, 2015/02/05
- [elpa] master d48e8cc 057/271: Add benchmark., Jackson Ray Hamilton, 2015/02/05
- [elpa] master d157167 258/271: Strip headers. Use make dependencies., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 63e2590 207/271: Merge branch 'develop', Jackson Ray Hamilton, 2015/02/05
- [elpa] master d4ddaa6 160/271: Use edge js2-mode., Jackson Ray Hamilton, 2015/02/05
- [elpa] master ef461da 230/271: Stop maintaining benchmarks in readme., Jackson Ray Hamilton, 2015/02/05