Merge pull request #1523 from ajaxorg/jshint

update jshint to 2.1.4

demo/kitchen-sink/demo.js

@@ -520,10 +520,10 @@ new StatusBar(env.editor, cmdLine.container);
 
 
 var Emmet = require("ace/ext/emmet");
-net.loadScript("https://rawgithub.com/nightwing/emmet-core/master/emmet.js", function() {
+net.loadScript("http://nightwing.github.io/emmet-core/emmet.js", function() {
     Emmet.setCore(window.emmet);
     env.editor.setOption("enableEmmet", true);
-})
+});
 
 
 // require("ace/placeholder").PlaceHolder;

demo/kitchen-sink/doclist.js

@@ -145,11 +145,11 @@ var docs = {
     "docs/assembly_x86.asm": "Assembly_x86",
     "docs/autohotkey.ahk": "AutoHotKey",
     "docs/batchfile.bat": "BatchFile",
-    "docs/erlang/erl": "Erlang",
+    "docs/erlang.erl": "Erlang",
     "docs/forth.frt": "Forth",
     "docs/haskell.hs": "Haskell",
     "docs/julia.js": "Julia",
-    "docs/prolog/plg": "Prolog",
+    "docs/prolog.plg": "Prolog",
     "docs/rust.rs": "Rust",
     "docs/twig.twig": "Twig"
 };

lib/ace/mode/javascript_worker.js

@@ -79,8 +79,8 @@ oop.inherits(JavaScriptWorker, Mirror);
         this.options = options || {
             // undef: true,
             // unused: true,
-            es5: true,
             esnext: true,
+            moz: true,
             devel: true,
             browser: true,
             node: true,

lib/ace/mode/javascript_worker_test.js

@@ -91,11 +91,11 @@ module.exports = {
     
     "test for each": function() {
         var worker = new JavaScriptWorker(this.sender);
-        worker.setValue("for each(var i in x)'");
+        worker.setValue("for each(var i in x)");
         worker.deferredUpdate.call();
         
         var error = this.sender.events[0][1][0];
-        assert.equal(error.text, "Expected '(' and instead saw 'each'.");
+        assert.equal(error.text, "Unexpected early end of program.");
     }
 };
 

lib/ace/snippets.js

@@ -469,10 +469,10 @@ var SnippetManager = function() {
         var snippetNameMap = this.snippetNameMap;
 
         function removeSnippet(s) {
-            var map = snippetNameMap[scope];
+            var nameMap = snippetNameMap[s.scope||scope];
-            if (map && map[s.name]) {
+            if (nameMap && nameMap[s.name]) {
-                delete map[s.name];
+                delete nameMap[s.name];
-                map = snippetMap[scope];
+                var map = snippetMap[s.scope||scope];
                 var i = map && map.indexOf(s);
                 if (i >= 0)
                     map.splice(i, 1);

lib/ace/worker/worker.js

@@ -4,17 +4,15 @@ if (typeof window.window != "undefined" && window.document) {
     return;
 }
 
-window.console = {
+window.console = function() {
-    log: function() {
     var msgs = Array.prototype.slice.call(arguments, 0);
     postMessage({type: "log", data: msgs});
-    },
-    error: function() {
-        var msgs = Array.prototype.slice.call(arguments, 0);
-        postMessage({type: "log", data: msgs});
-    },
-    trace: function() {}
 };
+window.console.error =
+window.console.warn = 
+window.console.log =
+window.console.trace = window.console;
+
 window.window = window;
 window.ace = window;
 

tool/update_deps.js

@@ -3,6 +3,7 @@ var https = require("https")
   , url = require("url")
   , fs = require("fs");
 
+var async = require("asyncjs");
 var rootDir = __dirname + "/../lib/ace/";
 
 var deps = [{
@@ -23,9 +24,56 @@ var deps = [{
             "(function (root, name, factory) {\n   factory(exports)\n}(this, 'luaparse',"
         )
     }
+}, {
+    path: "mode/javascript/jshint.js",
+    url: "http://jshint.com/get/jshint-2.1.4.js",
+    needsFixup: true,
+    postProcess: function(src) {
+        src = src.replace(/(\],|\{)((?:\d+|"\w+"):\[)/g, "$1\n$2")
+            .replace(/^(\},)(\{[^{}\[\]]*?\}\])/gm, "$1\n$2")
+
+        src = src.replace(
+            /"Expected a conditional expression and instead saw an assignment."/g,
+            '"Assignment in conditional expression"'
+        );
+
+        src = src.replace(/\brequire\(["']|\(require,|\(require\)/g, function(r){
+            return r.replace("require", "req");
+        })
+
+        src = src.replace(/var defaultMaxListeners = 10;/, function(a) {return a.replace("10", "200")});
+
+        src = src.replace(/var JSHINT;\s*\(function[\s()]+\{\s*/, "")
+            .replace(/JSHINT = .*\n\s*\}\(\)\);\s*/, "");
+        src += '\n'
+            + 'function req() {return require.apply(this, arguments)}\n'
+            + 'module.exports = req("jshint");\n';
+        return src;
+    }
+}, {
+    path: "ext/emmet-core.js",
+    url: [
+        "https://raw.github.com/sergeche/emmet-sublime/master/emmet/emmet-app.js",
+        "https://raw.github.com/sergeche/emmet-sublime/master/emmet/snippets.json"
+    ],
+    postProcess: function(data) {
+        return data[0]
+            .replace("define(emmet)", "define('emmet', [], emmet)")
+            .replace(/(emmet.define\('bootstrap'.*)[\s\S]*$/, function(_, x) {
+                return x + "\n" +
+                    "var snippets = " + data[1] + ";\n" +
+                    "var res = require('resources');\n" +
+                    "var userData = res.getVocabulary('user') || {};\n" +
+                    "res.setVocabulary(require('utils').deepMerge(userData, snippets), 'user');\n" +
+                    "});";
+        });
+    }
 }];
 
 var download = function(href, callback) {
+    if (Array.isArray(href))
+        return async.map(href, download, callback);
+
     var options = url.parse(href);
     var protocol = options.protocol === "https:" ? https : http;
     console.log("connecting to " + options.host + " " + options.path);
@@ -38,13 +86,13 @@ var download = function(href, callback) {
         });
 
         res.on("end", function(){
-			callback(data);
+            callback(null, data);
         });
     });
 };
 
 var getDep = function(dep) {
-	download(dep.url, function(data) {
+    download(dep.url, function(err, data) {
         if (dep.postProcess)
             data = dep.postProcess(data);
         if (dep.needsFixup)
@@ -59,7 +107,7 @@ var getDep = function(dep) {
     });
 };
 
-deps.forEach(getDep);
+deps.slice(-1).forEach(getDep);
 
 // coffee-script
 void function(){
@@ -86,7 +134,7 @@ void function(){
     var downloads = {}, counter = 0;
 
     deps.forEach(function(x) {
-		download(x.href, function(data) {
+        download(x.href, function(err, data) {
             counter++;
             downloads[x.name] = data;
             if (counter == deps.length)
@@ -125,73 +173,8 @@ void function(){
             });
         });
     }
-}();
+}//();
 
 
 
 
-var spawn = require("child_process").spawn;
-
-var run = function(cmd, cb) {
-	var proc = spawn("cmd", ["/c " + cmd]);
-
-	proc.stderr.setEncoding("utf8");
-	proc.stderr.on('data', function (data) {
-        // console.error(data);
-	});
-
-	proc.stdout.setEncoding("utf8");
-	proc.stdout.on('data', function (data) {
-        //console.log(data);
-	});
-
-	proc.on('exit', done);
-    proc.on('close', done);
-    function done(code) {
-        if (code !== 0) {
-            console.error(cmd + '::: process exited with code :::' + code);
-        }
-        cb()
-	}
-}
-
-function unquote(str) {
-    return str.replace(/\\(.)/g, function(x, a) {
-        return a == "n" ? "\n" 
-            : a == "t" ? "\t" 
-            : a == "r" ? "\r"
-            : a
-    });
-}
-
-run("npm install jshint", function() {
-    var jshintDist = fs.readFileSync("node_modules/jshint/dist/jshint.js", "utf8");
-    
-    jshintDist = jshintDist.replace(
-        /(require.define.*)Function\(\[([^\]]*?)\],\s*"(.*)"\s*\)/g, 
-        function(a, def, args, content) {
-            return def + "function("+args.replace(/["']/g, "") + ") {\n"
-                + unquote(content)
-                + "\n}";
-        }
-    );
-    jshintDist = jshintDist.replace(
-        /"Expected a conditional expression and instead saw an assignment."/g,
-        '"Assignment in conditional expression"'
-    );
-    
-    jshintDist = jshintDist.replace(/\brequire\(["']|\(require,|\(require\)/g, function(r){
-        return r.replace("require", "req");
-    }).replace(/\brequire\.define(\(|\s*=)/g, function(d){
-        return d.replace("define", "def");
-    });
-    
-    jshintDist = jshintDist.replace(/var defaultMaxListeners = 10;/, function(a) {return a.replace("10", "200")});
-    
-    jshintDist = 'define(function(require, exports, module) {\n'
-        + jshintDist + '\n'
-        + 'function req() {return require.apply(this, arguments)}\n'
-        + 'module.exports = req("/src/stable/jshint.js");\n'
-        +'});';
-    fs.writeFileSync(rootDir + "mode/javascript/jshint.js", jshintDist);
-});