Thu Mar 22 04:56:49 CET 2018

This commit is contained in:
c9jenkinsv3 2018-03-22 04:56:49 +01:00
parent 0d1b2e9a68
commit 09c1cd9355
49 changed files with 99 additions and 94 deletions

View File

@ -104655,7 +104655,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
var processNext = function() {
var msg = _self.messageBuffer.shift();
if (msg.command)
if (msg.command && main[msg.command])
main[msg.command].apply(main, msg.args);
else if (msg.event)
sender._signal(msg.event, msg.data);
@ -105244,13 +105244,8 @@ define("plugins/c9.ide.language/language",[], function(require, exports, module)
}
function updateRequireConfig(modulePath, worker) {
var path = window.requirejs.toUrl(modulePath, "", true);
var url = require.toUrl(path);
if (/^\w+:/.test(url)) {
var paths = {};
paths[path] = url;
worker.call("initBaseUrls", [paths]);
}
var config = window.requirejs.getConfig();
worker.call("updateRequireConfig", [config]);
}
plugin.on("load", function() {

View File

@ -3572,7 +3572,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
var processNext = function() {
var msg = _self.messageBuffer.shift();
if (msg.command)
if (msg.command && main[msg.command])
main[msg.command].apply(main, msg.args);
else if (msg.event)
sender._signal(msg.event, msg.data);

View File

@ -593,7 +593,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
var processNext = function() {
var msg = _self.messageBuffer.shift();
if (msg.command)
if (msg.command && main[msg.command])
main[msg.command].apply(main, msg.args);
else if (msg.event)
sender._signal(msg.event, msg.data);

View File

@ -738,7 +738,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
var processNext = function() {
var msg = _self.messageBuffer.shift();
if (msg.command)
if (msg.command && main[msg.command])
main[msg.command].apply(main, msg.args);
else if (msg.event)
sender._signal(msg.event, msg.data);

View File

@ -407,7 +407,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
var processNext = function() {
var msg = _self.messageBuffer.shift();
if (msg.command)
if (msg.command && main[msg.command])
main[msg.command].apply(main, msg.args);
else if (msg.event)
sender._signal(msg.event, msg.data);

View File

@ -738,7 +738,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
var processNext = function() {
var msg = _self.messageBuffer.shift();
if (msg.command)
if (msg.command && main[msg.command])
main[msg.command].apply(main, msg.args);
else if (msg.event)
sender._signal(msg.event, msg.data);

View File

@ -738,7 +738,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
var processNext = function() {
var msg = _self.messageBuffer.shift();
if (msg.command)
if (msg.command && main[msg.command])
main[msg.command].apply(main, msg.args);
else if (msg.event)
sender._signal(msg.event, msg.data);

View File

@ -1214,7 +1214,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
var processNext = function() {
var msg = _self.messageBuffer.shift();
if (msg.command)
if (msg.command && main[msg.command])
main[msg.command].apply(main, msg.args);
else if (msg.event)
sender._signal(msg.event, msg.data);

View File

@ -738,7 +738,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
var processNext = function() {
var msg = _self.messageBuffer.shift();
if (msg.command)
if (msg.command && main[msg.command])
main[msg.command].apply(main, msg.args);
else if (msg.event)
sender._signal(msg.event, msg.data);

View File

@ -738,7 +738,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
var processNext = function() {
var msg = _self.messageBuffer.shift();
if (msg.command)
if (msg.command && main[msg.command])
main[msg.command].apply(main, msg.args);
else if (msg.event)
sender._signal(msg.event, msg.data);

View File

@ -738,7 +738,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
var processNext = function() {
var msg = _self.messageBuffer.shift();
if (msg.command)
if (msg.command && main[msg.command])
main[msg.command].apply(main, msg.args);
else if (msg.event)
sender._signal(msg.event, msg.data);

View File

@ -738,7 +738,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
var processNext = function() {
var msg = _self.messageBuffer.shift();
if (msg.command)
if (msg.command && main[msg.command])
main[msg.command].apply(main, msg.args);
else if (msg.event)
sender._signal(msg.event, msg.data);

View File

@ -1653,7 +1653,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
var processNext = function() {
var msg = _self.messageBuffer.shift();
if (msg.command)
if (msg.command && main[msg.command])
main[msg.command].apply(main, msg.args);
else if (msg.event)
sender._signal(msg.event, msg.data);

View File

@ -1561,7 +1561,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
var processNext = function() {
var msg = _self.messageBuffer.shift();
if (msg.command)
if (msg.command && main[msg.command])
main[msg.command].apply(main, msg.args);
else if (msg.event)
sender._signal(msg.event, msg.data);

View File

@ -738,7 +738,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
var processNext = function() {
var msg = _self.messageBuffer.shift();
if (msg.command)
if (msg.command && main[msg.command])
main[msg.command].apply(main, msg.args);
else if (msg.event)
sender._signal(msg.event, msg.data);

View File

@ -738,7 +738,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
var processNext = function() {
var msg = _self.messageBuffer.shift();
if (msg.command)
if (msg.command && main[msg.command])
main[msg.command].apply(main, msg.args);
else if (msg.event)
sender._signal(msg.event, msg.data);

View File

@ -521,7 +521,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
var processNext = function() {
var msg = _self.messageBuffer.shift();
if (msg.command)
if (msg.command && main[msg.command])
main[msg.command].apply(main, msg.args);
else if (msg.event)
sender._signal(msg.event, msg.data);

View File

@ -176,7 +176,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
var processNext = function() {
var msg = _self.messageBuffer.shift();
if (msg.command)
if (msg.command && main[msg.command])
main[msg.command].apply(main, msg.args);
else if (msg.event)
sender._signal(msg.event, msg.data);

View File

@ -558,7 +558,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
var processNext = function() {
var msg = _self.messageBuffer.shift();
if (msg.command)
if (msg.command && main[msg.command])
main[msg.command].apply(main, msg.args);
else if (msg.event)
sender._signal(msg.event, msg.data);

View File

@ -738,7 +738,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
var processNext = function() {
var msg = _self.messageBuffer.shift();
if (msg.command)
if (msg.command && main[msg.command])
main[msg.command].apply(main, msg.args);
else if (msg.event)
sender._signal(msg.event, msg.data);

View File

@ -738,7 +738,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
var processNext = function() {
var msg = _self.messageBuffer.shift();
if (msg.command)
if (msg.command && main[msg.command])
main[msg.command].apply(main, msg.args);
else if (msg.event)
sender._signal(msg.event, msg.data);

View File

@ -2273,7 +2273,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
var processNext = function() {
var msg = _self.messageBuffer.shift();
if (msg.command)
if (msg.command && main[msg.command])
main[msg.command].apply(main, msg.args);
else if (msg.event)
sender._signal(msg.event, msg.data);

View File

@ -738,7 +738,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
var processNext = function() {
var msg = _self.messageBuffer.shift();
if (msg.command)
if (msg.command && main[msg.command])
main[msg.command].apply(main, msg.args);
else if (msg.event)
sender._signal(msg.event, msg.data);

View File

@ -738,7 +738,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
var processNext = function() {
var msg = _self.messageBuffer.shift();
if (msg.command)
if (msg.command && main[msg.command])
main[msg.command].apply(main, msg.args);
else if (msg.event)
sender._signal(msg.event, msg.data);

View File

@ -738,7 +738,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
var processNext = function() {
var msg = _self.messageBuffer.shift();
if (msg.command)
if (msg.command && main[msg.command])
main[msg.command].apply(main, msg.args);
else if (msg.event)
sender._signal(msg.event, msg.data);

View File

@ -738,7 +738,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
var processNext = function() {
var msg = _self.messageBuffer.shift();
if (msg.command)
if (msg.command && main[msg.command])
main[msg.command].apply(main, msg.args);
else if (msg.event)
sender._signal(msg.event, msg.data);

View File

@ -738,7 +738,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
var processNext = function() {
var msg = _self.messageBuffer.shift();
if (msg.command)
if (msg.command && main[msg.command])
main[msg.command].apply(main, msg.args);
else if (msg.event)
sender._signal(msg.event, msg.data);

View File

@ -738,7 +738,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
var processNext = function() {
var msg = _self.messageBuffer.shift();
if (msg.command)
if (msg.command && main[msg.command])
main[msg.command].apply(main, msg.args);
else if (msg.event)
sender._signal(msg.event, msg.data);

View File

@ -889,7 +889,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
var processNext = function() {
var msg = _self.messageBuffer.shift();
if (msg.command)
if (msg.command && main[msg.command])
main[msg.command].apply(main, msg.args);
else if (msg.event)
sender._signal(msg.event, msg.data);

View File

@ -738,7 +738,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
var processNext = function() {
var msg = _self.messageBuffer.shift();
if (msg.command)
if (msg.command && main[msg.command])
main[msg.command].apply(main, msg.args);
else if (msg.event)
sender._signal(msg.event, msg.data);

View File

@ -738,7 +738,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
var processNext = function() {
var msg = _self.messageBuffer.shift();
if (msg.command)
if (msg.command && main[msg.command])
main[msg.command].apply(main, msg.args);
else if (msg.event)
sender._signal(msg.event, msg.data);

View File

@ -738,7 +738,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
var processNext = function() {
var msg = _self.messageBuffer.shift();
if (msg.command)
if (msg.command && main[msg.command])
main[msg.command].apply(main, msg.args);
else if (msg.event)
sender._signal(msg.event, msg.data);

View File

@ -738,7 +738,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
var processNext = function() {
var msg = _self.messageBuffer.shift();
if (msg.command)
if (msg.command && main[msg.command])
main[msg.command].apply(main, msg.args);
else if (msg.event)
sender._signal(msg.event, msg.data);

View File

@ -738,7 +738,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
var processNext = function() {
var msg = _self.messageBuffer.shift();
if (msg.command)
if (msg.command && main[msg.command])
main[msg.command].apply(main, msg.args);
else if (msg.event)
sender._signal(msg.event, msg.data);

View File

@ -889,7 +889,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
var processNext = function() {
var msg = _self.messageBuffer.shift();
if (msg.command)
if (msg.command && main[msg.command])
main[msg.command].apply(main, msg.args);
else if (msg.event)
sender._signal(msg.event, msg.data);

View File

@ -176,7 +176,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
var processNext = function() {
var msg = _self.messageBuffer.shift();
if (msg.command)
if (msg.command && main[msg.command])
main[msg.command].apply(main, msg.args);
else if (msg.event)
sender._signal(msg.event, msg.data);

View File

@ -18,6 +18,17 @@ if (!window.console) {
window.window = window;
window.ace = window;
window.onerror = function(message, file, line, col, err) {
postMessage({type: "error", data: {
message: message,
data: err.data,
file: file,
line: line,
col: col,
stack: err.stack
}});
};
window.initSender = function initSender() {
var EventEmitter = window.require("ace/lib/event_emitter").EventEmitter;
@ -53,6 +64,10 @@ window.initSender = function initSender() {
var main = window.main = null;
var sender = window.sender = null;
window.updateRequireConfig = function(config) {
window.require.config(config);
};
window.onmessage = function(e) {
var msg = e.data;
if (msg.event && sender) {
@ -10615,29 +10630,18 @@ function endTime(t, message, indent) {
throw e;
}
}
var handler;
try {
handler = require(path);
if (!handler)
throw new Error("Unable to load required module: " + path);
} catch (e) {
if (isInWebWorker) {
console.error("Could not load language handler " + path + ": " + e);
_self.sender.emit("registered", { path: path, err: e.message });
callback && callback(e);
throw e;
require([path], function(handler) {
if (!handler) {
_self.sender.emit("registered", { path: path, err: "Could not load" });
callback && callback("Could not load");
throw new Error("Could not load language handler " + path);
}
require([path], function(handler) {
if (!handler) {
_self.sender.emit("registered", { path: path, err: "Could not load" });
callback && callback("Could not load");
throw new Error("Could not load language handler " + path);
}
onRegistered(handler);
});
return;
}
onRegistered(handler);
onRegistered(handler);
}, function(e) {
console.error("Could not load language handler " + path + ": " + e);
_self.sender.emit("registered", { path: path, err: e.message });
callback && callback(e);
});
};
this.$createEmitter = function(path) {
@ -10663,11 +10667,11 @@ function endTime(t, message, indent) {
};
this.unregister = function(modulePath, callback) {
if (window.require)
window.require.modules[modulePath] = null;
this.handlers = this.handlers.filter(function(h) {
return h.$source !== modulePath;
});
if (window.require)
window.require.undef(modulePath, true);
callback && callback();
};
@ -15114,21 +15118,14 @@ worker.loadPlugin = function(modulePath, contents, callback) {
return callback("Could not load language handler " + modulePath + ": " + e);
}
}
var handler;
try {
handler = require(modulePath);
require([modulePath], function(handler) {
if (!handler)
throw new Error("Unable to load required module: " + modulePath);
} catch (e) {
if (isInWebWorker)
return callback("Could not load language handler " + modulePath + ": " + e);
return require([modulePath], function(handler) {
if (!handler)
return callback("Could not load language handler " + modulePath);
callback(null, handler);
});
}
callback(null, handler);
return callback("Could not load language handler " + modulePath);
callback(null, handler);
}, function(err) {
callback(err);
});
};
worker.handlesLanguage = function(language, part) {

View File

@ -58,6 +58,5 @@
"tmp": "tmp/inherits-2.0.3.tgz_1473295776489_0.08142363070510328"
},
"directories": {},
"_resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
"readme": "ERROR: No README data found!"
"_resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
}

View File

@ -248,7 +248,7 @@
},
"homepage": "https://github.com/ternjs/tern#readme",
"_id": "tern@0.16.1",
"_shasum": "c70e3d1aee6a22c539c4733d9ca9f7ea8c83a2a5",
"_shasum": "37530ed600eee84bad9d5f894206e032f09fdb2e",
"_from": "git+https://github.com/cloud9ide/tern.git#39015d544d4c00c7899fea4c95c2e5bc2720e68e",
"_resolved": "git+https://github.com/cloud9ide/tern.git#39015d544d4c00c7899fea4c95c2e5bc2720e68e"
}

View File

@ -20,7 +20,7 @@
"readme": "# tern_from_ts\n\nTern signatures extracted from typescript signatures.\n\nLicense: MIT\n\nSee also https://github.com/marijnh/tern and https://github.com/borisyankov/DefinitelyTyped\n",
"readmeFilename": "README.md",
"_id": "tern_from_ts@0.0.1",
"_shasum": "bc0ac28960a201c500f57003c9507d929d48c366",
"_shasum": "10ae5479694bf3e02e121a65b7fea3e6981df0b7",
"_from": "git+https://github.com/cloud9ide/tern_from_ts.git#66df507986bbdd63f3bc4f0c53edb39169ce4f1c",
"_resolved": "git+https://github.com/cloud9ide/tern_from_ts.git#66df507986bbdd63f3bc4f0c53edb39169ce4f1c"
}

View File

@ -36,7 +36,7 @@
"homepage": "https://github.com/isaacs/inherits#readme",
"_id": "inherits@2.0.3",
"_shasum": "633c2c83e3da42a502f52466022480f4208261de",
"_from": "inherits@>=2.0.1 <2.1.0",
"_from": "inherits@>=2.0.0 <3.0.0",
"_npmVersion": "3.10.7",
"_nodeVersion": "6.5.0",
"_npmUser": {

2
node_modules/nak/package.json generated vendored
View File

@ -52,7 +52,7 @@
},
"homepage": "https://github.com/gjtorikian/nak#readme",
"_id": "nak@0.3.3",
"_shasum": "8ec4253160635cd6f3b39970b7d7e6ca85cbd26b",
"_shasum": "d62ee39ee75e83b237e5afb42439bfe2a8023cf8",
"_from": "git+https://github.com/cloud9ide/nak.git#6deef931594",
"_resolved": "git+https://github.com/cloud9ide/nak.git#6deef931594787edd167040f7352e3e7533430e4"
}

View File

@ -58,6 +58,5 @@
"tmp": "tmp/inherits-2.0.3.tgz_1473295776489_0.08142363070510328"
},
"directories": {},
"_resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
"readme": "ERROR: No README data found!"
"_resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
}

2
node_modules/tern/package.json generated vendored
View File

@ -248,7 +248,7 @@
},
"homepage": "https://github.com/ternjs/tern#readme",
"_id": "tern@0.16.1",
"_shasum": "c70e3d1aee6a22c539c4733d9ca9f7ea8c83a2a5",
"_shasum": "37530ed600eee84bad9d5f894206e032f09fdb2e",
"_from": "git+https://github.com/cloud9ide/tern.git#39015d544d4c00c7899fea4c95c2e5bc2720e68e",
"_resolved": "git+https://github.com/cloud9ide/tern.git#39015d544d4c00c7899fea4c95c2e5bc2720e68e"
}

View File

@ -20,7 +20,7 @@
"readme": "# tern_from_ts\n\nTern signatures extracted from typescript signatures.\n\nLicense: MIT\n\nSee also https://github.com/marijnh/tern and https://github.com/borisyankov/DefinitelyTyped\n",
"readmeFilename": "README.md",
"_id": "tern_from_ts@0.0.1",
"_shasum": "bc0ac28960a201c500f57003c9507d929d48c366",
"_shasum": "10ae5479694bf3e02e121a65b7fea3e6981df0b7",
"_from": "git+https://github.com/cloud9ide/tern_from_ts.git#66df507986bbdd63f3bc4f0c53edb39169ce4f1c",
"_resolved": "git+https://github.com/cloud9ide/tern_from_ts.git#66df507986bbdd63f3bc4f0c53edb39169ce4f1c"
}

View File

@ -49,5 +49,5 @@
},
"devDependencies": {},
"licenses": [],
"revision": "131091a73f77b55ce93a89493dc78ac5b6910386"
"revision": "904c80f4e91fd72c1cf7b21be617dbfb9fc3161e"
}

View File

@ -18,6 +18,17 @@ if (!window.console) {
window.window = window;
window.ace = window;
window.onerror = function(message, file, line, col, err) {
postMessage({type: "error", data: {
message: message,
data: err.data,
file: file,
line: line,
col: col,
stack: err.stack
}});
};
window.initSender = function initSender() {
var EventEmitter = window.require("ace/lib/event_emitter").EventEmitter;
@ -53,6 +64,10 @@ window.initSender = function initSender() {
var main = window.main = null;
var sender = window.sender = null;
window.updateRequireConfig = function(config) {
window.require.config(config);
};
window.onmessage = function(e) {
var msg = e.data;
if (msg.event && sender) {

View File

@ -213,7 +213,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) {
var processNext = function() {
var msg = _self.messageBuffer.shift();
if (msg.command)
if (msg.command && main[msg.command])
main[msg.command].apply(main, msg.args);
else if (msg.event)
sender._signal(msg.event, msg.data);

View File

@ -1 +1 @@
1521604590
1521691005