From 31d92edd1b6d5271861e0a7da99dde553b684852 Mon Sep 17 00:00:00 2001 From: Tim Robinson Date: Wed, 23 Mar 2016 15:22:31 +0000 Subject: [PATCH 001/160] Add vfs.log to log from client directly to vfs server --- plugins/c9.vfs.client/log-service.js | 10 ++++ plugins/c9.vfs.client/vfs.log.js | 77 ++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+) create mode 100644 plugins/c9.vfs.client/log-service.js create mode 100644 plugins/c9.vfs.client/vfs.log.js diff --git a/plugins/c9.vfs.client/log-service.js b/plugins/c9.vfs.client/log-service.js new file mode 100644 index 00000000..0b503eff --- /dev/null +++ b/plugins/c9.vfs.client/log-service.js @@ -0,0 +1,10 @@ + +module.exports = function(vfs, options, register) { + register(null, { + log: function(message, callback) { + console.log("VFSLOG: " + message); + console.error("VFSERROR: " + message); + callback(); + } + }) +} \ No newline at end of file diff --git a/plugins/c9.vfs.client/vfs.log.js b/plugins/c9.vfs.client/vfs.log.js new file mode 100644 index 00000000..e515a690 --- /dev/null +++ b/plugins/c9.vfs.client/vfs.log.js @@ -0,0 +1,77 @@ +/** Sends client side logs to vfs via the websocket connection **/ + +define(function (require, exports, module) { + "use strict"; + + main.consumes = ["Plugin", "ext", "c9"]; + main.provides = ["vfs.log"]; + return main; + + function main(options, imports, register) { + var Plugin = imports.Plugin; + var c9 = imports.c9; + var ext = imports.ext; + var plugin = new Plugin("Ajax.org", main.consumes); + + var loaded = false; + var server = null; + + function load() { + if (loaded) return false; + loaded = true; + + ext.loadRemotePlugin("log", { + code: require("text!./log-service.js"), + redefine: true + }, function(err, remote) { + if (err) return console.error(err); + + server = remote; + }); + + c9.on("stateChange", function(e) { + if (e.state & c9.NETWORK) { + load(); + } + else { + loaded = false; + server = null; + } + }, plugin); + + } + + + function log() { + if (!server) return console.error("Cannot log, client is offline"); + + var args = Array.prototype.slice.call(arguments); + var message = ""; + args.forEach(function (arg) { + if (typeof arg === "object") { + return message += JSON.stringify(arg); + } + message += arg; + }); + + server.log(message); + } + + plugin.on("load", function() { + load(); + }); + + plugin.on("unload", function() { + loaded = false; + server = null; + }); + + plugin.freezePublicAPI({ + log: log + }); + + register(null, { + "vfs.log": plugin + }); + } +}) \ No newline at end of file From e2541f62cfbf38e8ddc3422a171bbc2edf199365 Mon Sep 17 00:00:00 2001 From: Tim Robinson Date: Wed, 23 Mar 2016 15:29:00 +0000 Subject: [PATCH 002/160] Adding client side logs around saving to determine if we're somehow failing to save to disk correctly --- package.json | 4 ++-- plugins/c9.fs/fs.streams.js | 4 ++++ plugins/c9.fs/fs.xhr.js | 5 +++++ plugins/c9.vfs.client/vfs_client.js | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 8c0b1f7c..aaa9ab7e 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "c9.ide.language.javascript.infer": "#325ac6880e", "c9.ide.language.jsonalyzer": "#4b329741b1", "c9.ide.language.codeintel": "#046d39603b", - "c9.ide.collab": "#11a0d3c5ce", + "c9.ide.collab": "#7e6b7225f3", "c9.ide.local": "#10eb45842a", "c9.ide.find": "#e33fbaed2f", "c9.ide.find.infiles": "#c0a13737ef", @@ -108,7 +108,7 @@ "c9.ide.run": "#485f06bd22", "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", - "c9.ide.save": "#4cda35bfdb", + "c9.ide.save": "#8219605f37", "c9.ide.scm": "#dc87315012", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#a282ec1619", diff --git a/plugins/c9.fs/fs.streams.js b/plugins/c9.fs/fs.streams.js index 19a5fbfe..f0d72435 100644 --- a/plugins/c9.fs/fs.streams.js +++ b/plugins/c9.fs/fs.streams.js @@ -33,6 +33,8 @@ return function(vfs, base, baseProc, cli) { if (encoding) options.encoding = encoding; + console.log("[vfs.stream] Reading file " + path); + vfs.readfile(resolvePath(path), options, function(err, meta) { if (err) return callback(err); @@ -70,6 +72,8 @@ return function(vfs, base, baseProc, cli) { var stream = options.stream = new Stream(); stream.readable = true; + console.log("[vfs.stream] Writing file " + path); + vfs.mkfile(resolvePath(path), options, function(err, meta) { if (err) return callback(err); diff --git a/plugins/c9.fs/fs.xhr.js b/plugins/c9.fs/fs.xhr.js index 69020713..a604b78d 100644 --- a/plugins/c9.fs/fs.xhr.js +++ b/plugins/c9.fs/fs.xhr.js @@ -4,6 +4,7 @@ define(function (require, exports, module) { return function(_request) { function request(method, path, body, callback, progress, sync, headers) { + // This goes to rest() function in vfs_client.js return _request(path, { method: method, body: body, @@ -31,6 +32,8 @@ return function(_request) { return callback(err); } + console.log("[vfs.xhr] Reading file " + path); + var headers = metadata ? { "x-request-metadata" : "true" } : null; return request("GET", path, "", function(err, data, res) { if (err) @@ -77,6 +80,8 @@ return function(_request) { // It would then be interpreted as a directory if (path.substr(-1) == "/") path = path.substr(0, path.length - 1); + + console.log("[vfs.xhr] Writing file " + path); return request("PUT", path, data, callback, progress, sync); } diff --git a/plugins/c9.vfs.client/vfs_client.js b/plugins/c9.vfs.client/vfs_client.js index 9e11a4d0..c61ebc73 100644 --- a/plugins/c9.vfs.client/vfs_client.js +++ b/plugins/c9.vfs.client/vfs_client.js @@ -146,6 +146,7 @@ define(function(require, exports, module) { function rest(path, options, callback) { if (!vfs || !connection || connection.readyState != "open") { + console.error("[vfs-client] Cannot perform rest action for ", path, " vfs is disconnected"); var stub = { abort: function(){ buffer[this.id]= null; } }; stub.id = buffer.push([path, options, callback, stub]) - 1; return stub; From ffca6961fd69daf7d700549e0f310b539826b2fa Mon Sep 17 00:00:00 2001 From: Tim Robinson Date: Wed, 23 Mar 2016 19:02:05 +0000 Subject: [PATCH 003/160] Add callback to log function. Fix logging --- configs/client-default.js | 1 + plugins/c9.vfs.client/log-service.js | 8 ++++---- plugins/c9.vfs.client/vfs.log.js | 7 ++++++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/configs/client-default.js b/configs/client-default.js index 7756c0fc..d903032d 100644 --- a/configs/client-default.js +++ b/configs/client-default.js @@ -109,6 +109,7 @@ module.exports = function(options) { // VFS "plugins/c9.vfs.client/vfs.ping", + "plugins/c9.vfs.client/vfs.log", { packagePath: "plugins/c9.vfs.client/vfs_client", debug: debug, diff --git a/plugins/c9.vfs.client/log-service.js b/plugins/c9.vfs.client/log-service.js index 0b503eff..44ec4475 100644 --- a/plugins/c9.vfs.client/log-service.js +++ b/plugins/c9.vfs.client/log-service.js @@ -1,9 +1,9 @@ - module.exports = function(vfs, options, register) { register(null, { - log: function(message, callback) { - console.log("VFSLOG: " + message); - console.error("VFSERROR: " + message); + log: function (message, callback) { + callback = callback || function(){}; + + console.log(message); callback(); } }) diff --git a/plugins/c9.vfs.client/vfs.log.js b/plugins/c9.vfs.client/vfs.log.js index e515a690..3d3c453a 100644 --- a/plugins/c9.vfs.client/vfs.log.js +++ b/plugins/c9.vfs.client/vfs.log.js @@ -44,8 +44,13 @@ define(function (require, exports, module) { function log() { if (!server) return console.error("Cannot log, client is offline"); + var callback = function(){}; var args = Array.prototype.slice.call(arguments); + if (typeof args[args.length-1] === "function") { + callback = args.splice(args.length-1, 1); + } + var message = ""; args.forEach(function (arg) { if (typeof arg === "object") { @@ -54,7 +59,7 @@ define(function (require, exports, module) { message += arg; }); - server.log(message); + server.log(message, callback); } plugin.on("load", function() { From 48c00026d15b49eb4c09b7f57905aa9b62380a85 Mon Sep 17 00:00:00 2001 From: Tim Robinson Date: Wed, 23 Mar 2016 19:13:34 +0000 Subject: [PATCH 004/160] Removing attributes param as it was never used --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 80fd10b7..5a20fcae 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "c9.ide.language.javascript.infer": "#325ac6880e", "c9.ide.language.jsonalyzer": "#4b329741b1", "c9.ide.language.codeintel": "#046d39603b", - "c9.ide.collab": "#7e6b7225f3", + "c9.ide.collab": "#438d4a0205", "c9.ide.local": "#10eb45842a", "c9.ide.find": "#e33fbaed2f", "c9.ide.find.infiles": "#c0a13737ef", From a3feeaefed405667b4428a3b7cc20142110b9a3e Mon Sep 17 00:00:00 2001 From: Tim Robinson Date: Wed, 23 Mar 2016 19:13:59 +0000 Subject: [PATCH 005/160] Adding logging to fs calls --- plugins/c9.fs/fs.js | 7 ++++--- plugins/c9.fs/fs.streams.js | 6 +++--- plugins/c9.fs/fs.xhr.js | 6 +++--- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/plugins/c9.fs/fs.js b/plugins/c9.fs/fs.js index f07b7746..5cf6eb30 100644 --- a/plugins/c9.fs/fs.js +++ b/plugins/c9.fs/fs.js @@ -10,16 +10,17 @@ */ //@todo might have to add queueing for safe operations define(function(require, exports, module) { - main.consumes = ["vfs", "Plugin", "auth"]; + main.consumes = ["vfs", "Plugin", "auth", "vfs.log"]; main.provides = ["fs"]; return main; function main(options, imports, register) { var vfs = imports.vfs; + var logger = imports["vfs.log"]; var Plugin = imports.Plugin; - var stream = require("./fs.streams")(vfs, options.base, options.baseProc, options.cli); - var xhr = options.cli ? stream : require("./fs.xhr")(vfs.rest); + var stream = require("./fs.streams")(vfs, options.base, options.baseProc, options.cli, logger); + var xhr = options.cli ? stream : require("./fs.xhr")(vfs.rest, logger); var uCaseFirst = require("c9/string").uCaseFirst; var normalize = require("path").normalize; diff --git a/plugins/c9.fs/fs.streams.js b/plugins/c9.fs/fs.streams.js index f0d72435..69127f71 100644 --- a/plugins/c9.fs/fs.streams.js +++ b/plugins/c9.fs/fs.streams.js @@ -3,7 +3,7 @@ define(function(require, exports, module) { var Stream = require("stream").Stream; var PATH = require("path"); -return function(vfs, base, baseProc, cli) { +return function(vfs, base, baseProc, cli, logger) { var resolvePath = function(path, basePath) { if (path.charAt(0) == "~") { @@ -33,7 +33,7 @@ return function(vfs, base, baseProc, cli) { if (encoding) options.encoding = encoding; - console.log("[vfs.stream] Reading file " + path); + logger.log("[vfs.stream] Reading file " + path); vfs.readfile(resolvePath(path), options, function(err, meta) { if (err) @@ -72,7 +72,7 @@ return function(vfs, base, baseProc, cli) { var stream = options.stream = new Stream(); stream.readable = true; - console.log("[vfs.stream] Writing file " + path); + logger.log("[vfs.stream] Writing file " + path); vfs.mkfile(resolvePath(path), options, function(err, meta) { if (err) diff --git a/plugins/c9.fs/fs.xhr.js b/plugins/c9.fs/fs.xhr.js index a604b78d..2691506c 100644 --- a/plugins/c9.fs/fs.xhr.js +++ b/plugins/c9.fs/fs.xhr.js @@ -1,7 +1,7 @@ define(function (require, exports, module) { "use strict"; -return function(_request) { +return function(_request, logger) { function request(method, path, body, callback, progress, sync, headers) { // This goes to rest() function in vfs_client.js @@ -32,7 +32,7 @@ return function(_request) { return callback(err); } - console.log("[vfs.xhr] Reading file " + path); + logger.log("[vfs.xhr] Reading file " + path); var headers = metadata ? { "x-request-metadata" : "true" } : null; return request("GET", path, "", function(err, data, res) { @@ -81,7 +81,7 @@ return function(_request) { if (path.substr(-1) == "/") path = path.substr(0, path.length - 1); - console.log("[vfs.xhr] Writing file " + path); + logger.log("[vfs.xhr] Writing file " + path); return request("PUT", path, data, callback, progress, sync); } From 3c93c26df21a19eabb0110ccc46e0fec89973c02 Mon Sep 17 00:00:00 2001 From: Tim Robinson Date: Wed, 23 Mar 2016 20:12:28 +0000 Subject: [PATCH 006/160] Added detection of code revert errors --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5a20fcae..f1108ead 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "c9.ide.language.javascript.infer": "#325ac6880e", "c9.ide.language.jsonalyzer": "#4b329741b1", "c9.ide.language.codeintel": "#046d39603b", - "c9.ide.collab": "#438d4a0205", + "c9.ide.collab": "#d7091487e6", "c9.ide.local": "#10eb45842a", "c9.ide.find": "#e33fbaed2f", "c9.ide.find.infiles": "#c0a13737ef", From 3d28206252ea0513a4245c18a7889cc06b0a2281 Mon Sep 17 00:00:00 2001 From: Tim Robinson Date: Wed, 23 Mar 2016 21:04:57 +0000 Subject: [PATCH 007/160] Add vfs.log mock to tests --- package.json | 2 +- plugins/c9.fs/fs_test.js | 2 +- plugins/c9.vfs.standalone/www/test.js | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index f1108ead..d83d732f 100644 --- a/package.json +++ b/package.json @@ -108,7 +108,7 @@ "c9.ide.run": "#485f06bd22", "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", - "c9.ide.save": "#8219605f37", + "c9.ide.save": "#25a63f31e2", "c9.ide.scm": "#dc87315012", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#a282ec1619", diff --git a/plugins/c9.fs/fs_test.js b/plugins/c9.fs/fs_test.js index f2a85c8c..269d4add 100644 --- a/plugins/c9.fs/fs_test.js +++ b/plugins/c9.fs/fs_test.js @@ -21,7 +21,7 @@ require(["lib/architect/architect", "lib/chai/chai", "/vfs-root"], //Mock Plugins { consumes: ["Plugin"], - provides: ["auth.bootstrap", "info", "dialog.error"], + provides: ["auth.bootstrap", "info", "dialog.error", "vfs.log"], setup: expect.html.mocked }, { diff --git a/plugins/c9.vfs.standalone/www/test.js b/plugins/c9.vfs.standalone/www/test.js index f30a80b4..b1fff309 100644 --- a/plugins/c9.vfs.standalone/www/test.js +++ b/plugins/c9.vfs.standalone/www/test.js @@ -94,6 +94,9 @@ require([ var x = new EventEmitter(); return x; })(), + "vfs.log": { + log: function(){} + }, anims: (function(){ var x = new EventEmitter(); x.animateSplitBoxNode = function(node, opt) { From e184e88c9e21e6d887d9176c61900a9ac2dd7cc2 Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Thu, 24 Mar 2016 10:45:48 +0000 Subject: [PATCH 008/160] address review comments --- plugins/c9.vfs.client/endpoint.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/plugins/c9.vfs.client/endpoint.js b/plugins/c9.vfs.client/endpoint.js index c90ff5e3..24ad4b9f 100644 --- a/plugins/c9.vfs.client/endpoint.js +++ b/plugins/c9.vfs.client/endpoint.js @@ -251,6 +251,13 @@ define(function(require, exports, module) { }, 10000); return; } + else if (err.code == 503) { + // service unavailable + setTimeout(function() { + tryNext(i); + }, res.error.retryIn || 15000); + return; + } else if (err.code === 500 && res && res.error && res.error.cause) { return callback(res.error.cause.message); } From cad9d22009e22cd5fada8f21d1eb01550ec0dc4b Mon Sep 17 00:00:00 2001 From: Tim Robinson Date: Thu, 24 Mar 2016 14:18:26 +0000 Subject: [PATCH 009/160] Remove logging from fs, might slow down vfs too much --- plugins/c9.fs/fs.js | 7 +++---- plugins/c9.fs/fs.streams.js | 6 +----- plugins/c9.fs/fs.xhr.js | 7 +------ 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/plugins/c9.fs/fs.js b/plugins/c9.fs/fs.js index 5cf6eb30..f07b7746 100644 --- a/plugins/c9.fs/fs.js +++ b/plugins/c9.fs/fs.js @@ -10,17 +10,16 @@ */ //@todo might have to add queueing for safe operations define(function(require, exports, module) { - main.consumes = ["vfs", "Plugin", "auth", "vfs.log"]; + main.consumes = ["vfs", "Plugin", "auth"]; main.provides = ["fs"]; return main; function main(options, imports, register) { var vfs = imports.vfs; - var logger = imports["vfs.log"]; var Plugin = imports.Plugin; - var stream = require("./fs.streams")(vfs, options.base, options.baseProc, options.cli, logger); - var xhr = options.cli ? stream : require("./fs.xhr")(vfs.rest, logger); + var stream = require("./fs.streams")(vfs, options.base, options.baseProc, options.cli); + var xhr = options.cli ? stream : require("./fs.xhr")(vfs.rest); var uCaseFirst = require("c9/string").uCaseFirst; var normalize = require("path").normalize; diff --git a/plugins/c9.fs/fs.streams.js b/plugins/c9.fs/fs.streams.js index 69127f71..19a5fbfe 100644 --- a/plugins/c9.fs/fs.streams.js +++ b/plugins/c9.fs/fs.streams.js @@ -3,7 +3,7 @@ define(function(require, exports, module) { var Stream = require("stream").Stream; var PATH = require("path"); -return function(vfs, base, baseProc, cli, logger) { +return function(vfs, base, baseProc, cli) { var resolvePath = function(path, basePath) { if (path.charAt(0) == "~") { @@ -33,8 +33,6 @@ return function(vfs, base, baseProc, cli, logger) { if (encoding) options.encoding = encoding; - logger.log("[vfs.stream] Reading file " + path); - vfs.readfile(resolvePath(path), options, function(err, meta) { if (err) return callback(err); @@ -72,8 +70,6 @@ return function(vfs, base, baseProc, cli, logger) { var stream = options.stream = new Stream(); stream.readable = true; - logger.log("[vfs.stream] Writing file " + path); - vfs.mkfile(resolvePath(path), options, function(err, meta) { if (err) return callback(err); diff --git a/plugins/c9.fs/fs.xhr.js b/plugins/c9.fs/fs.xhr.js index 2691506c..69020713 100644 --- a/plugins/c9.fs/fs.xhr.js +++ b/plugins/c9.fs/fs.xhr.js @@ -1,10 +1,9 @@ define(function (require, exports, module) { "use strict"; -return function(_request, logger) { +return function(_request) { function request(method, path, body, callback, progress, sync, headers) { - // This goes to rest() function in vfs_client.js return _request(path, { method: method, body: body, @@ -32,8 +31,6 @@ return function(_request, logger) { return callback(err); } - logger.log("[vfs.xhr] Reading file " + path); - var headers = metadata ? { "x-request-metadata" : "true" } : null; return request("GET", path, "", function(err, data, res) { if (err) @@ -80,8 +77,6 @@ return function(_request, logger) { // It would then be interpreted as a directory if (path.substr(-1) == "/") path = path.substr(0, path.length - 1); - - logger.log("[vfs.xhr] Writing file " + path); return request("PUT", path, data, callback, progress, sync); } From 525d3e5b994ac44dfef8d159c52866b50c762050 Mon Sep 17 00:00:00 2001 From: nightwing Date: Thu, 31 Mar 2016 15:36:32 +0000 Subject: [PATCH 010/160] fix issue with vfs worker not passing falsy values --- node_modules/vfs-socket/worker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node_modules/vfs-socket/worker.js b/node_modules/vfs-socket/worker.js index 8cf0d3f4..ed7a282b 100644 --- a/node_modules/vfs-socket/worker.js +++ b/node_modules/vfs-socket/worker.js @@ -437,7 +437,7 @@ function Worker(vfs) { var keys = Object.keys(meta || {}); for (var i = 0, l = keys.length; i < l; i++) { var key = keys[i]; - if (!meta[key]) + if (meta[key] == undefined) continue; switch (key) { case "stream": token.stream = storeStream(meta.stream); break; From f904da1073ca866437f27bec173a9dfdeea2f487 Mon Sep 17 00:00:00 2001 From: nightwing Date: Thu, 31 Mar 2016 17:03:28 +0000 Subject: [PATCH 011/160] add test for execfile --- plugins/c9.fs/proc_test.js | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/plugins/c9.fs/proc_test.js b/plugins/c9.fs/proc_test.js index db68c57e..96be5406 100644 --- a/plugins/c9.fs/proc_test.js +++ b/plugins/c9.fs/proc_test.js @@ -37,7 +37,7 @@ require(["lib/architect/architect", "lib/chai/chai"], function (architect, chai) describe('proc', function() { describe('spawn()', function() { - this.timeout(4000); + this.timeout(10000); it("should spawn a child process", function(done) { var args = ["-e", "process.stdin.pipe(process.stdout);try{process.stdin.resume()}catch(e) {};"]; @@ -66,8 +66,8 @@ require(["lib/architect/architect", "lib/chai/chai"], function (architect, chai) }); }); - //should test the kill() method - which is broken now - //Another test - see that cwd defaults to the root vfs dir when resolve is set to true + // should test the kill() method - which is broken now + // Another test - see that cwd defaults to the root vfs dir when resolve is set to true }); describe('execFile()', function() { this.timeout(10000); @@ -101,8 +101,19 @@ require(["lib/architect/architect", "lib/chai/chai"], function (architect, chai) }); }); - //should test the kill() method - which is broken now - //Another test - see that cwd defaults to the root vfs dir when resolve is set to true + it('should pass stdout and stderr', function(done) { + proc.execFile("node", { + args: ["-v"] + }, function(e, stdout, stderr) { + expect(stdout[0]).to.equal("v"); + expect(stderr).to.equal(""); + expect(e).to.not.ok; + done(); + }); + }); + + // should test the kill() method - which is broken now + // Another test - see that cwd defaults to the root vfs dir when resolve is set to true }); describe('pty()', function() { this.timeout(30000); From f4fb88845296602e8409406898d7e321cee4f946 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 1 Apr 2016 16:40:31 +0200 Subject: [PATCH 012/160] c9-auto-bump 3.1.2033 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 72dec48d..1745cbef 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2032", + "version": "3.1.2033", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 13328e14c078aa8ad85ea8bf3d49d965e8939bac Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 1 Apr 2016 18:22:59 +0200 Subject: [PATCH 013/160] c9-auto-bump 3.1.2034 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1745cbef..53745965 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2033", + "version": "3.1.2034", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 7ec5491b09496f99115a1250124edf6c037e905d Mon Sep 17 00:00:00 2001 From: c9bot Date: Sat, 2 Apr 2016 00:40:12 +0200 Subject: [PATCH 014/160] c9-auto-bump 3.1.2035 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 53745965..2acd6750 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2034", + "version": "3.1.2035", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 40854a89b738dd5691fba2dc6dde22ae656d694b Mon Sep 17 00:00:00 2001 From: c9bot Date: Sat, 2 Apr 2016 21:21:30 +0200 Subject: [PATCH 015/160] c9-auto-bump 3.1.2036 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2acd6750..2aecc688 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2035", + "version": "3.1.2036", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From ec6b764668ffee45a7767c2ddf178dae2afbda72 Mon Sep 17 00:00:00 2001 From: c9bot Date: Sun, 3 Apr 2016 23:34:23 +0200 Subject: [PATCH 016/160] c9-auto-bump 3.1.2037 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2aecc688..b4d26127 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2036", + "version": "3.1.2037", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From d3f65148fe02f56ee7c2fed7cea77cd8059ac53c Mon Sep 17 00:00:00 2001 From: nightwing Date: Mon, 4 Apr 2016 02:13:38 +0400 Subject: [PATCH 017/160] fix regression in env popup --- node_modules/ace_tree/lib/ace_tree/edit.js | 5 +++-- plugins/c9.ide.tree/tree.js | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/node_modules/ace_tree/lib/ace_tree/edit.js b/node_modules/ace_tree/lib/ace_tree/edit.js index 09bb8dfb..a76f115f 100644 --- a/node_modules/ace_tree/lib/ace_tree/edit.js +++ b/node_modules/ace_tree/lib/ace_tree/edit.js @@ -258,6 +258,7 @@ var EditableTree = function(tree) { var ace = this.ace; this.ace = null; + this.$lastAce = ace; ace.renderer.freeze(); setTimeout(function() { // doing this after timeout to allow rename event focus something else @@ -267,6 +268,7 @@ var EditableTree = function(tree) { ace.wrapper.parentNode.removeChild(ace.wrapper); if (wasFocused) this.tree.focus(); + this.$lastAce = null; }.bind(this)); }; @@ -386,6 +388,7 @@ var EditableTree = function(tree) { var val = this.ace.getValue(); + this._destroyEditor(); if (!cancel && this.origVal !== val) { this.tree._emit("rename", { @@ -396,8 +399,6 @@ var EditableTree = function(tree) { }); this.tree.provider._signal("change"); } - - this._destroyEditor(); }; }).call(EditableTree.prototype); diff --git a/plugins/c9.ide.tree/tree.js b/plugins/c9.ide.tree/tree.js index 7aff77a6..34187998 100644 --- a/plugins/c9.ide.tree/tree.js +++ b/plugins/c9.ide.tree/tree.js @@ -520,7 +520,7 @@ define(function(require, exports, module) { } if (dirname(newpath) != dirname(path)) { - tree.edit.ace.blur(); // TODO this shouldn't be needed when apf focus works + tree.edit.$lastAce && tree.edit.$lastAce.blur(); // TODO this shouldn't be needed when apf focus works question( "Confirm move to a new folder", "move '" + e.oldValue + "' to \n" + From a6c0bd6e2492188b607c366bd86de60dbb770b52 Mon Sep 17 00:00:00 2001 From: nightwing Date: Mon, 4 Apr 2016 02:14:53 +0400 Subject: [PATCH 018/160] fix misaligned label in preview switcher --- plugins/c9.ide.layout.classic/less/btn-switcher.less | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/c9.ide.layout.classic/less/btn-switcher.less b/plugins/c9.ide.layout.classic/less/btn-switcher.less index 3af6342c..74e4a5cc 100644 --- a/plugins/c9.ide.layout.classic/less/btn-switcher.less +++ b/plugins/c9.ide.layout.classic/less/btn-switcher.less @@ -1,8 +1,10 @@ .btn-switcher { .user-select(none); - + -webkit-display: flex; + display: flex; + -webkit-align-items: center; + align-items: center; cursor: default; - line-height: 19px; font-size: @preview-chooser-font-size; font-weight: @preview-chooser-font-weight; color: ; @@ -46,6 +48,5 @@ .btn-switcherIcon { background-repeat: no-repeat; padding-left: 25px; - padding-top: 5px; - background-position: 5px 6px; + background-position: 5px 50% } \ No newline at end of file From 9c829d23d797630cfb5b85b67a040488fb036883 Mon Sep 17 00:00:00 2001 From: nightwing Date: Mon, 4 Apr 2016 03:14:19 +0400 Subject: [PATCH 019/160] fix error in twoway diff viewer --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2aecc688..55f274f5 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#219b66019a", + "c9.ide.scm": "#637a68cd04", "c9.ide.terminal.monitor": "#affa33572f", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From 00174eb6689da2a4832e965df336591325d6c3a9 Mon Sep 17 00:00:00 2001 From: nightwing Date: Mon, 4 Apr 2016 03:28:51 +0400 Subject: [PATCH 020/160] fix paste in terminal --- plugins/c9.ide.terminal/aceterm/input.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/c9.ide.terminal/aceterm/input.js b/plugins/c9.ide.terminal/aceterm/input.js index 18289eb8..424afcbd 100644 --- a/plugins/c9.ide.terminal/aceterm/input.js +++ b/plugins/c9.ide.terminal/aceterm/input.js @@ -221,7 +221,7 @@ define(function(require, exports, module) { }]); ace.onPaste = function(text) { - this.send(text.replace(/\r\n/g, "\n")); + this.send(text.replace(/\r\n?|\n/g, this.session.term.convertEol ? "\n" : "\r")); }; ace.setKeyboardHandler(this); From 49fb42964c849113fb54ad46e3b38417b43bb23e Mon Sep 17 00:00:00 2001 From: nightwing Date: Mon, 4 Apr 2016 03:29:43 +0400 Subject: [PATCH 021/160] fix resizing of output panes on windows --- node_modules/vfs-local/localfs.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/node_modules/vfs-local/localfs.js b/node_modules/vfs-local/localfs.js index 0805a6cd..6885fefa 100644 --- a/node_modules/vfs-local/localfs.js +++ b/node_modules/vfs-local/localfs.js @@ -1562,7 +1562,7 @@ module.exports = function setup(fsOptions) { // todo add resize event proc.emit("data", {rows: rows, cols: cols}); - if (!tmuxWarned) { + if (!tmuxWarned && !isWin) { if (/v0\.([123456789]\..*|10\.(0|1|2[0-7]))/.test(process.version)) { proc.emit("data", { message: "Wrong Node.js version: " + process.version, @@ -2020,7 +2020,8 @@ module.exports = function setup(fsOptions) { }; this.resize = function() { - return pty.resize.apply(pty, arguments); + if (!exited) + return pty.resize.apply(pty, arguments); }; // this.acknowledgeWrite = function(callback) { From b49f9e4f7d59907007a85c234a45d77f2b580abd Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 06:33:55 +0200 Subject: [PATCH 022/160] c9-auto-bump 3.1.2038 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b4d26127..92acaa9d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2037", + "version": "3.1.2038", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 49b23ec7e1bc36221e0e0b9c8bea4f8b33aac7b6 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 10:17:05 +0200 Subject: [PATCH 023/160] c9-auto-bump 3.1.2039 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 92acaa9d..f09b11ad 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2038", + "version": "3.1.2039", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 4d6c0aff7684d37afb0ad9aafc98fac003c4ccd6 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 11:53:59 +0200 Subject: [PATCH 024/160] c9-auto-bump 3.1.2040 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f09b11ad..fae5a834 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2039", + "version": "3.1.2040", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From acfad9413efd0603209fd5f8650330bf1aca05b7 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 12:27:57 +0200 Subject: [PATCH 025/160] c9-auto-bump 3.1.2041 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fae5a834..7cc11fc5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2040", + "version": "3.1.2041", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From e4a6df9b0fe925b9ea4b1a97a57c7e2938e5b2d8 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 12:52:53 +0200 Subject: [PATCH 026/160] c9-auto-bump 3.1.2042 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7cc11fc5..64025a56 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2041", + "version": "3.1.2042", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From a5f8780a0b8b6e09ae2ba7624f6c4424572d9fb8 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 14:10:01 +0200 Subject: [PATCH 027/160] c9-auto-bump 3.1.2043 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 64025a56..ea44b98a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2042", + "version": "3.1.2043", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 26e1eeac33eee2361d13dfb7d167a2b176919ef1 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 14:26:38 +0200 Subject: [PATCH 028/160] c9-auto-bump 3.1.2044 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ea44b98a..4d707768 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2043", + "version": "3.1.2044", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 32043d276c84834d410ea34e4ddf2ac41aeb6be1 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 14:27:32 +0200 Subject: [PATCH 029/160] c9-auto-bump 3.1.2045 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4d707768..397cd673 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2044", + "version": "3.1.2045", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From f4659dec45bb310c955db0ee9a00f18c46ebb559 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 14:38:04 +0200 Subject: [PATCH 030/160] c9-auto-bump 3.1.2046 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 397cd673..552401d6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2045", + "version": "3.1.2046", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 10e9b87a0427f9907918da56bc32fde4043690ad Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 14:39:59 +0200 Subject: [PATCH 031/160] c9-auto-bump 3.1.2047 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 552401d6..13021900 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2046", + "version": "3.1.2047", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 2d653f00b1afe8b2cac2730c606f6254aa3e1a94 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 14:40:19 +0200 Subject: [PATCH 032/160] c9-auto-bump 3.1.2048 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bb9015b9..684a4c0c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2047", + "version": "3.1.2048", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 76fac67683f3426116cd77a1fed59ecd41bf50e8 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 14:56:30 +0200 Subject: [PATCH 033/160] c9-auto-bump 3.1.2049 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 684a4c0c..ce0da967 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2048", + "version": "3.1.2049", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 4432e39fa024f50110b0a19a54128dfe6988b683 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 14:58:37 +0200 Subject: [PATCH 034/160] c9-auto-bump 3.1.2050 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ce0da967..c85688cb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2049", + "version": "3.1.2050", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 5437fcde18c2f90baead2a3e76389bd563b934ea Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 15:00:36 +0200 Subject: [PATCH 035/160] c9-auto-bump 3.1.2051 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c85688cb..0f3b2973 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2050", + "version": "3.1.2051", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 53034fd49972d56d73b427df5286d1c34f3dd823 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 15:01:50 +0200 Subject: [PATCH 036/160] c9-auto-bump 3.1.2052 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0f3b2973..fabd08cb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2051", + "version": "3.1.2052", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 403688af6b464adf58b0b31372c7a9f31fafe9d6 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 16:25:46 +0200 Subject: [PATCH 037/160] c9-auto-bump 3.1.2053 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fabd08cb..038ea488 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2052", + "version": "3.1.2053", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From c86ecd856ec39ef94c735078be677ab93c2dc213 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 16:28:48 +0200 Subject: [PATCH 038/160] c9-auto-bump 3.1.2054 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 038ea488..5b674e6c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2053", + "version": "3.1.2054", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From fb1cec777054cb38e8b0bc775255a37f4d64463f Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 16:41:09 +0200 Subject: [PATCH 039/160] c9-auto-bump 3.1.2055 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5b674e6c..49301eb3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2054", + "version": "3.1.2055", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From bb3238226f60b358afc0f09f71f52d10be51db19 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 17:29:50 +0200 Subject: [PATCH 040/160] c9-auto-bump 3.1.2056 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 49301eb3..bcf167fb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2055", + "version": "3.1.2056", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 83e38fddb568fcd7c0bb4ee3c4889b594cba36a5 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 20:30:27 +0200 Subject: [PATCH 041/160] c9-auto-bump 3.1.2057 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bcf167fb..9f958dc4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2056", + "version": "3.1.2057", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From ff884bad3c9e74c540709c7869ba935e3d67a4dc Mon Sep 17 00:00:00 2001 From: Tim Robinson Date: Mon, 4 Apr 2016 19:28:53 +0000 Subject: [PATCH 042/160] Added out logging from OTDocument about various state conflicts --- package.json | 2 +- plugins/c9.fs/fs_test.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index d83d732f..d29b169d 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "c9.ide.language.javascript.infer": "#325ac6880e", "c9.ide.language.jsonalyzer": "#4b329741b1", "c9.ide.language.codeintel": "#046d39603b", - "c9.ide.collab": "#d7091487e6", + "c9.ide.collab": "#c9048d629a", "c9.ide.local": "#10eb45842a", "c9.ide.find": "#e33fbaed2f", "c9.ide.find.infiles": "#c0a13737ef", diff --git a/plugins/c9.fs/fs_test.js b/plugins/c9.fs/fs_test.js index 269d4add..f2a85c8c 100644 --- a/plugins/c9.fs/fs_test.js +++ b/plugins/c9.fs/fs_test.js @@ -21,7 +21,7 @@ require(["lib/architect/architect", "lib/chai/chai", "/vfs-root"], //Mock Plugins { consumes: ["Plugin"], - provides: ["auth.bootstrap", "info", "dialog.error", "vfs.log"], + provides: ["auth.bootstrap", "info", "dialog.error"], setup: expect.html.mocked }, { From 95a1ca074b26092d587e354d02730850ef8a804e Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 21:48:20 +0200 Subject: [PATCH 043/160] c9-auto-bump 3.1.2058 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9f958dc4..413ad340 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2057", + "version": "3.1.2058", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 3e36496e3a1114019deca00b487dff5a8eca68f4 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 21:49:12 +0200 Subject: [PATCH 044/160] c9-auto-bump 3.1.2059 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 413ad340..28442914 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2058", + "version": "3.1.2059", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 7ac8ae99eea9c65d98b5695a6f26a2e19832ffc2 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 5 Apr 2016 09:58:13 +0200 Subject: [PATCH 045/160] c9-auto-bump 3.1.2060 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 28442914..5bffc75d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2059", + "version": "3.1.2060", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 3b59c0fa08721964ddf71168d3a66b5e91f6a71f Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 5 Apr 2016 11:26:09 +0200 Subject: [PATCH 046/160] c9-auto-bump 3.1.2061 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5bffc75d..ad75ce28 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2060", + "version": "3.1.2061", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 493e055d09786db318e42a989804aceec9911bad Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 5 Apr 2016 12:36:13 +0200 Subject: [PATCH 047/160] c9-auto-bump 3.1.2062 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ad75ce28..a0f5a6f3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2061", + "version": "3.1.2062", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From fa788c79c3f4656c2b99583f326ac0c7224e1d45 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 5 Apr 2016 14:10:32 +0200 Subject: [PATCH 048/160] c9-auto-bump 3.1.2063 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a0f5a6f3..27458be1 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2062", + "version": "3.1.2063", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 1920a08e214c92dbc9e827375e79b7a6128c6013 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 5 Apr 2016 14:16:40 +0200 Subject: [PATCH 049/160] c9-auto-bump 3.1.2064 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 27458be1..83875612 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2063", + "version": "3.1.2064", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From dc328420b4160807441b71621888f976a9143ac4 Mon Sep 17 00:00:00 2001 From: nightwing Date: Tue, 5 Apr 2016 18:48:22 +0400 Subject: [PATCH 050/160] update ace --- node_modules/ace/lib/ace/ace.js | 4 +- node_modules/ace/lib/ace/css/editor.css | 1 + node_modules/ace/lib/ace/ext/modelist.js | 2 + node_modules/ace/lib/ace/ext/themelist.js | 1 + .../ace/lib/ace/keyboard/textinput.js | 20 +- node_modules/ace/lib/ace/keyboard/vim.js | 8 +- node_modules/ace/lib/ace/keyboard/vim_test.js | 41 ++- node_modules/ace/lib/ace/lib/event.js | 31 +- .../ace/lib/ace/mode/_test/tokens_rust.json | 2 +- .../lib/ace/mode/behaviour/behaviour_test.js | 10 +- .../ace/lib/ace/mode/behaviour/cstyle.js | 2 + .../ace/lib/ace/mode/behaviour/xml.js | 6 +- node_modules/ace/lib/ace/mode/drools.js | 55 ++++ .../lib/ace/mode/drools_highlight_rules.js | 262 ++++++++++++++++ .../ace/lib/ace/mode/folding/drools.js | 49 +++ node_modules/ace/lib/ace/mode/fortran.js | 112 +++++++ .../lib/ace/mode/fortran_highlight_rules.js | 233 ++++++++++++++ node_modules/ace/lib/ace/mode/handlebars.js | 2 - .../ace/lib/ace/mode/html_completions.js | 2 +- .../ace/lib/ace/mode/javascript_worker.js | 2 +- .../ace/lib/ace/mode/php_highlight_rules.js | 2 +- node_modules/ace/lib/ace/mode/razor.js | 33 ++ .../ace/lib/ace/mode/razor_completions.js | 112 +++++++ .../ace/lib/ace/mode/razor_highlight_rules.js | 160 ++++++++++ node_modules/ace/lib/ace/mode/rst.js | 51 +++ .../ace/lib/ace/mode/rst_highlight_rules.js | 296 ++++++++++++++++++ .../ace/lib/ace/mode/rust_highlight_rules.js | 2 +- node_modules/ace/lib/ace/mode/text.js | 6 +- node_modules/ace/lib/ace/mode/tsx.js | 52 +++ node_modules/ace/lib/ace/scrollbar.js | 18 +- node_modules/ace/lib/ace/snippets/drools.js | 7 + .../ace/lib/ace/snippets/drools.snippets | 19 ++ node_modules/ace/lib/ace/snippets/f.js | 7 + node_modules/ace/lib/ace/snippets/fortran.js | 7 + .../ace/lib/ace/snippets/fortran.snippets | 0 node_modules/ace/lib/ace/snippets/fsharp.js | 7 + .../ace/lib/ace/snippets/fsharp.snippets | 0 node_modules/ace/lib/ace/snippets/razor.js | 7 + .../ace/lib/ace/snippets/razor.snippets | 4 + node_modules/ace/lib/ace/theme/gruvbox.css | 122 ++++++++ node_modules/ace/lib/ace/theme/gruvbox.js | 9 + node_modules/ace/lib/ace/virtual_renderer.js | 2 +- settings/standalone.js | 1 + 43 files changed, 1709 insertions(+), 60 deletions(-) create mode 100644 node_modules/ace/lib/ace/mode/drools.js create mode 100644 node_modules/ace/lib/ace/mode/drools_highlight_rules.js create mode 100644 node_modules/ace/lib/ace/mode/folding/drools.js create mode 100644 node_modules/ace/lib/ace/mode/fortran.js create mode 100644 node_modules/ace/lib/ace/mode/fortran_highlight_rules.js create mode 100644 node_modules/ace/lib/ace/mode/razor.js create mode 100644 node_modules/ace/lib/ace/mode/razor_completions.js create mode 100644 node_modules/ace/lib/ace/mode/razor_highlight_rules.js create mode 100644 node_modules/ace/lib/ace/mode/rst.js create mode 100644 node_modules/ace/lib/ace/mode/rst_highlight_rules.js create mode 100644 node_modules/ace/lib/ace/mode/tsx.js create mode 100644 node_modules/ace/lib/ace/snippets/drools.js create mode 100644 node_modules/ace/lib/ace/snippets/drools.snippets create mode 100644 node_modules/ace/lib/ace/snippets/f.js create mode 100644 node_modules/ace/lib/ace/snippets/fortran.js create mode 100644 node_modules/ace/lib/ace/snippets/fortran.snippets create mode 100644 node_modules/ace/lib/ace/snippets/fsharp.js create mode 100644 node_modules/ace/lib/ace/snippets/fsharp.snippets create mode 100644 node_modules/ace/lib/ace/snippets/razor.js create mode 100644 node_modules/ace/lib/ace/snippets/razor.snippets create mode 100644 node_modules/ace/lib/ace/theme/gruvbox.css create mode 100644 node_modules/ace/lib/ace/theme/gruvbox.js diff --git a/node_modules/ace/lib/ace/ace.js b/node_modules/ace/lib/ace/ace.js index 803f8379..68ac7416 100644 --- a/node_modules/ace/lib/ace/ace.js +++ b/node_modules/ace/lib/ace/ace.js @@ -62,10 +62,12 @@ exports.config = require("./config"); * Provides access to require in packed noconflict mode * @param {String} moduleName * @returns {Object} - * **/ exports.require = require; +if (typeof define === "function") + exports.define = define; + /** * Embeds the Ace editor into the DOM, at the element provided by `el`. * @param {String | DOMElement} el Either the id of an element, or the element itself diff --git a/node_modules/ace/lib/ace/css/editor.css b/node_modules/ace/lib/ace/css/editor.css index 831566f9..6bff6a4a 100644 --- a/node_modules/ace/lib/ace/css/editor.css +++ b/node_modules/ace/lib/ace/css/editor.css @@ -3,6 +3,7 @@ overflow: hidden; font: 12px/normal 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace; direction: ltr; + text-align: left; } .ace_scroller { diff --git a/node_modules/ace/lib/ace/ext/modelist.js b/node_modules/ace/lib/ace/ext/modelist.js index fcd0b150..13c1170f 100644 --- a/node_modules/ace/lib/ace/ext/modelist.js +++ b/node_modules/ace/lib/ace/ext/modelist.js @@ -67,6 +67,7 @@ var supportedModes = { Diff: ["diff|patch"], Dockerfile: ["^Dockerfile"], Dot: ["dot"], + Drools: ["drl"], Dummy: ["dummy"], DummySyntax: ["dummy"], Eiffel: ["e|ge"], @@ -165,6 +166,7 @@ var supportedModes = { Toml: ["toml"], Twig: ["twig|swig"], Typescript: ["ts|typescript|str"], + TSX: ["tsx"], Vala: ["vala"], VBScript: ["vbs|vb"], Velocity: ["vm"], diff --git a/node_modules/ace/lib/ace/ext/themelist.js b/node_modules/ace/lib/ace/ext/themelist.js index 2350a2e2..63ada63e 100644 --- a/node_modules/ace/lib/ace/ext/themelist.js +++ b/node_modules/ace/lib/ace/ext/themelist.js @@ -63,6 +63,7 @@ var themeData = [ ["Chaos" ,"chaos" , "dark"], ["Clouds Midnight" ,"clouds_midnight" , "dark"], ["Cobalt" ,"cobalt" , "dark"], + ["Gruvbox" ,"gruvbox" , "dark"], ["idle Fingers" ,"idle_fingers" , "dark"], ["krTheme" ,"kr_theme" , "dark"], ["Merbivore" ,"merbivore" , "dark"], diff --git a/node_modules/ace/lib/ace/keyboard/textinput.js b/node_modules/ace/lib/ace/keyboard/textinput.js index cb6dc6b0..1a57b2e6 100644 --- a/node_modules/ace/lib/ace/keyboard/textinput.js +++ b/node_modules/ace/lib/ace/keyboard/textinput.js @@ -263,18 +263,22 @@ var TextInput = function(parentNode, host) { resetValue(); }; - var handleClipboardData = function(e, data) { + var handleClipboardData = function(e, data, forceIEMime) { var clipboardData = e.clipboardData || window.clipboardData; if (!clipboardData || BROKEN_SETDATA) return; // using "Text" doesn't work on old webkit but ie needs it - // TODO are there other browsers that require "Text"? - var mime = USE_IE_MIME_TYPE ? "Text" : "text/plain"; - if (data) { - // Safari 5 has clipboardData object, but does not handle setData() - return clipboardData.setData(mime, data) !== false; - } else { - return clipboardData.getData(mime); + var mime = USE_IE_MIME_TYPE || forceIEMime ? "Text" : "text/plain"; + try { + if (data) { + // Safari 5 has clipboardData object, but does not handle setData() + return clipboardData.setData(mime, data) !== false; + } else { + return clipboardData.getData(mime); + } + } catch(e) { + if (!forceIEMime) + return handleClipboardData(e, data, true); } }; diff --git a/node_modules/ace/lib/ace/keyboard/vim.js b/node_modules/ace/lib/ace/keyboard/vim.js index e0f512bb..9c295fb4 100644 --- a/node_modules/ace/lib/ace/keyboard/vim.js +++ b/node_modules/ace/lib/ace/keyboard/vim.js @@ -863,9 +863,9 @@ dom.importCssString(".normal-mode .ace_cursor{\ { keys: '', type: 'keyToKey', toKeys: '', context: 'insert' }, { keys: '', type: 'keyToKey', toKeys: '', context: 'insert' }, { keys: 's', type: 'keyToKey', toKeys: 'cl', context: 'normal' }, - { keys: 's', type: 'keyToKey', toKeys: 'xi', context: 'visual'}, + { keys: 's', type: 'keyToKey', toKeys: 'c', context: 'visual'}, { keys: 'S', type: 'keyToKey', toKeys: 'cc', context: 'normal' }, - { keys: 'S', type: 'keyToKey', toKeys: 'dcc', context: 'visual' }, + { keys: 'S', type: 'keyToKey', toKeys: 'VdO', context: 'visual' }, { keys: '', type: 'keyToKey', toKeys: '0' }, { keys: '', type: 'keyToKey', toKeys: '$' }, { keys: '', type: 'keyToKey', toKeys: '' }, @@ -963,6 +963,7 @@ dom.importCssString(".normal-mode .ace_cursor{\ { keys: 'v', type: 'action', action: 'toggleVisualMode' }, { keys: 'V', type: 'action', action: 'toggleVisualMode', actionArgs: { linewise: true }}, { keys: '', type: 'action', action: 'toggleVisualMode', actionArgs: { blockwise: true }}, + { keys: '', type: 'action', action: 'toggleVisualMode', actionArgs: { blockwise: true }}, { keys: 'gv', type: 'action', action: 'reselectLastSelection' }, { keys: 'J', type: 'action', action: 'joinLines', isEdit: true }, { keys: 'p', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: true, isEdit: true }}, @@ -1481,8 +1482,7 @@ dom.importCssString(".normal-mode .ace_cursor{\ exCommandDispatcher.map(lhs, rhs, ctx); }, unmap: function(lhs, ctx) { - // remove user defined key bindings. - exCommandDispatcher.unmap(lhs, ctx || "normal"); + exCommandDispatcher.unmap(lhs, ctx); }, // TODO: Expose setOption and getOption as instance methods. Need to decide how to namespace // them, or somehow make them work with the existing CodeMirror setOption/getOption API. diff --git a/node_modules/ace/lib/ace/keyboard/vim_test.js b/node_modules/ace/lib/ace/keyboard/vim_test.js index f0766688..c9c1543d 100644 --- a/node_modules/ace/lib/ace/keyboard/vim_test.js +++ b/node_modules/ace/lib/ace/keyboard/vim_test.js @@ -1135,6 +1135,20 @@ testVim('D_visual_block', function(cm, vim, helpers) { eq('1\n5\na', cm.getValue()); }, {value: '1234\n5678\nabcdefg'}); +testVim('s_visual_block', function(cm, vim, helpers) { + cm.setCursor(0, 1); + helpers.doKeys('', '2', 'j', 'l', 'l', 'l', 's'); + var replacement = fillArray('hello{', 3); + cm.replaceSelections(replacement); + eq('1hello{\n5hello{\nahello{fg\n', cm.getValue()); + helpers.doKeys(''); + cm.setCursor(2, 3); + helpers.doKeys('', '1', 'k', 'h', 'S'); + replacement = fillArray('world', 1); + cm.replaceSelections(replacement); + eq('1hello{\n world\n', cm.getValue()); +}, {value: '1234\n5678\nabcdefg\n'}); + // Swapcase commands edit in place and do not modify registers. testVim('g~w_repeat', function(cm, vim, helpers) { // Assert that dw does delete newline if it should go to the next line, and @@ -3210,6 +3224,25 @@ forEach(['zb','zz','zt','z-','z.','z'], function(e, idx){ return new Array(500).join('\n'); })()}); }); +testVim('zb_to_bottom', function(cm, vim, helpers){ + var lineNum = 250; + cm.setSize(600, 35*cm.defaultTextHeight()); + cm.setCursor(lineNum, 0); + helpers.doKeys('z', 'b'); + var scrollInfo = cm.getScrollInfo(); + eq(scrollInfo.top + scrollInfo.clientHeight, cm.charCoords(Pos(lineNum, 0), 'local').bottom); +}, { value: (function(){ + return new Array(500).join('\n'); +})()}); +testVim('zt_to_top', function(cm, vim, helpers){ + var lineNum = 250; + cm.setSize(600, 35*cm.defaultTextHeight()); + cm.setCursor(lineNum, 0); + helpers.doKeys('z', 't'); + eq(cm.getScrollInfo().top, cm.charCoords(Pos(lineNum, 0), 'local').top); +}, { value: (function(){ + return new Array(500).join('\n'); +})()}); testVim('zb', 'gg', 'normal'); + is(CodeMirror.Vim.handleKey(cm, "", "normal"), "Alt-X key is mapped"); + CodeMirror.Vim.unmap("", "normal"); + is(!CodeMirror.Vim.handleKey(cm, "", "normal"), "Alt-X key is unmapped"); +}); // Testing registration of functions as ex-commands and mapping to -keys testVim('ex_api_test', function(cm, vim, helpers) { diff --git a/node_modules/ace/lib/ace/lib/event.js b/node_modules/ace/lib/ace/lib/event.js index 25b33e54..28815212 100644 --- a/node_modules/ace/lib/ace/lib/event.js +++ b/node_modules/ace/lib/ace/lib/event.js @@ -260,7 +260,7 @@ function normalizeCommandKeys(callback, e, keyCode) { var hashId = getModifierHash(e); if (!useragent.isMac && pressedKeys) { - if (pressedKeys.OSKey) + if (e.getModifierState && (e.getModifierState("OS") || e.getModifierState("Win"))) hashId |= 8; if (pressedKeys.altGr) { if ((3 & hashId) != 3) @@ -339,19 +339,8 @@ exports.addCommandKeyListener = function(el, callback) { var lastDefaultPrevented = null; addListener(el, "keydown", function(e) { - var keyCode = e.keyCode; - pressedKeys[keyCode] = (pressedKeys[keyCode] || 0) + 1; - if (keyCode == 91 || keyCode == 92) { - pressedKeys.OSKey = true; - } else if (pressedKeys.OSKey) { - if (e.timeStamp - pressedKeys.lastT > 200 && pressedKeys.count == 1) - resetPressedKeys(); - } - if (pressedKeys[keyCode] == 1) - pressedKeys.count++; - // console.log(e.timeStamp - pressedKeys.lastT) - pressedKeys.lastT = e.timeStamp; - var result = normalizeCommandKeys(callback, e, keyCode); + pressedKeys[e.keyCode] = (pressedKeys[e.keyCode] || 0) + 1; + var result = normalizeCommandKeys(callback, e, e.keyCode); lastDefaultPrevented = e.defaultPrevented; return result; }); @@ -364,17 +353,7 @@ exports.addCommandKeyListener = function(el, callback) { }); addListener(el, "keyup", function(e) { - var keyCode = e.keyCode; - if (!pressedKeys[keyCode]) { - // console.log("resetting", 1) - resetPressedKeys(); - } else { - pressedKeys.count = Math.max(pressedKeys.count - 1, 0); - } - if (keyCode == 91 || keyCode == 92) { - pressedKeys.OSKey = false; - } - pressedKeys[keyCode] = null; + pressedKeys[e.keyCode] = null; }); if (!pressedKeys) { @@ -386,8 +365,6 @@ exports.addCommandKeyListener = function(el, callback) { function resetPressedKeys() { // console.log("resetting") pressedKeys = Object.create(null); - pressedKeys.count = 0; - pressedKeys.lastT = 0; } if (typeof window == "object" && window.postMessage && !useragent.isOldIE) { diff --git a/node_modules/ace/lib/ace/mode/_test/tokens_rust.json b/node_modules/ace/lib/ace/mode/_test/tokens_rust.json index 6bf9e861..141b92b0 100644 --- a/node_modules/ace/lib/ace/mode/_test/tokens_rust.json +++ b/node_modules/ace/lib/ace/mode/_test/tokens_rust.json @@ -86,7 +86,7 @@ ["keyword.operator","!"], ["paren.lparen","("], ["string.quoted.double.source.rust","\"%s says: '%d'"], - ["constant.character.escape.source.rust","\\n"], + ["constant.character.escape.source.rust","\\n\\\\"], ["string.quoted.double.source.rust","\""], ["punctuation.operator",","], ["text"," name"], diff --git a/node_modules/ace/lib/ace/mode/behaviour/behaviour_test.js b/node_modules/ace/lib/ace/mode/behaviour/behaviour_test.js index 245edf99..657e25f1 100644 --- a/node_modules/ace/lib/ace/mode/behaviour/behaviour_test.js +++ b/node_modules/ace/lib/ace/mode/behaviour/behaviour_test.js @@ -161,7 +161,7 @@ module.exports = { " " ].join("\n")); editor.session.setMode(new XMLMode); - exec("gotolinedown", 1); + exec("golinedown", 1); exec("gotolineend", 1); exec("insertstring", 1, '\n'); assert.equal(editor.session.getLine(2), " "); @@ -169,6 +169,14 @@ module.exports = { exec("gotolineend", 1); exec("insertstring", 1, '\n'); assert.equal(editor.session.getLine(2), " "); + editor.session.setValue(["'); + assert.equal(editor.session.getLine(1), " "); } }; diff --git a/node_modules/ace/lib/ace/mode/behaviour/cstyle.js b/node_modules/ace/lib/ace/mode/behaviour/cstyle.js index dd1b0d14..c0b2e478 100644 --- a/node_modules/ace/lib/ace/mode/behaviour/cstyle.js +++ b/node_modules/ace/lib/ace/mode/behaviour/cstyle.js @@ -251,6 +251,8 @@ var CstyleBehaviour = function() { this.add("string_dquotes", "insertion", function(state, action, editor, session, text) { if (text == '"' || text == "'") { + if (this.lineCommentStart && this.lineCommentStart.indexOf(text) != -1) + return; initContext(editor); var quote = text; var selection = editor.getSelectionRange(); diff --git a/node_modules/ace/lib/ace/mode/behaviour/xml.js b/node_modules/ace/lib/ace/mode/behaviour/xml.js index 068fdb31..549faa62 100644 --- a/node_modules/ace/lib/ace/mode/behaviour/xml.js +++ b/node_modules/ace/lib/ace/mode/behaviour/xml.js @@ -100,7 +100,7 @@ var XmlBehaviour = function () { this.add("autoclosing", "insertion", function (state, action, editor, session, text) { if (text == '>') { - var position = editor.getCursorPosition(); + var position = editor.getSelectionRange().start; var iterator = new TokenIterator(session, position.row, position.column); var token = iterator.getCurrentToken() || iterator.stepBackward(); @@ -124,6 +124,10 @@ var XmlBehaviour = function () { // find tag name while (!is(token, "tag-name")) { token = iterator.stepBackward(); + if (token.value == "<") { + token = iterator.stepForward(); + break; + } } var tokenRow = iterator.getCurrentTokenRow(); diff --git a/node_modules/ace/lib/ace/mode/drools.js b/node_modules/ace/lib/ace/mode/drools.js new file mode 100644 index 00000000..1f408c59 --- /dev/null +++ b/node_modules/ace/lib/ace/mode/drools.js @@ -0,0 +1,55 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Distributed under the BSD license: + * + * Copyright (c) 2014, Ajax.org B.V. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Ajax.org B.V. nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * ***** END LICENSE BLOCK ***** */ + +define(function(require, exports, module) { +"use strict"; + +var oop = require("../lib/oop"); +var TextMode = require("./text").Mode; +var DroolsHighlightRules = require("./drools_highlight_rules").DroolsHighlightRules; +var Range = require("../range").Range; +var DroolsFoldMode = require("./folding/drools").FoldMode; + +var Mode = function() { + this.HighlightRules = DroolsHighlightRules; + this.foldingRules = new DroolsFoldMode(); + +}; +oop.inherits(Mode, TextMode); + +(function() { + this.lineCommentStart = "//"; + this.$id = "ace/mode/drools"; +}).call(Mode.prototype); + +exports.Mode = Mode; + +}); + diff --git a/node_modules/ace/lib/ace/mode/drools_highlight_rules.js b/node_modules/ace/lib/ace/mode/drools_highlight_rules.js new file mode 100644 index 00000000..1e0008d0 --- /dev/null +++ b/node_modules/ace/lib/ace/mode/drools_highlight_rules.js @@ -0,0 +1,262 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Distributed under the BSD license: + * + * Copyright (c) 2012, Ajax.org B.V. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Ajax.org B.V. nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * ***** END LICENSE BLOCK ***** */ + +define(function(require, exports, module) { +"use strict"; + +var oop = require("../lib/oop"); +var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; +var JavaHighlightRules = require("./java_highlight_rules").JavaHighlightRules; +var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules; + +var identifierRe = "[a-zA-Z\\$_\u00a1-\uffff][a-zA-Z\\d\\$_\u00a1-\uffff]*"; +var packageIdentifierRe = "[a-zA-Z\\$_\u00a1-\uffff][\\.a-zA-Z\\d\\$_\u00a1-\uffff]*"; + +var DroolsHighlightRules = function() { + + var keywords = ("date|effective|expires|lock|on|active|no|loop|auto|focus" + + "|activation|group|agenda|ruleflow|duration|timer|calendars|refract|direct" + + "|dialect|salience|enabled|attributes|extends|template" + + "|function|contains|matches|eval|excludes|soundslike" + + "|memberof|not|in|or|and|exists|forall|over|from|entry|point|accumulate|acc|collect" + + "|action|reverse|result|end|init|instanceof|extends|super|boolean|char|byte|short" + + "|int|long|float|double|this|void|class|new|case|final|if|else|for|while|do" + + "|default|try|catch|finally|switch|synchronized|return|throw|break|continue|assert" + + "|modify|static|public|protected|private|abstract|native|transient|volatile" + + "|strictfp|throws|interface|enum|implements|type|window|trait|no-loop|str" + ); + + var langClasses = ( + "AbstractMethodError|AssertionError|ClassCircularityError|"+ + "ClassFormatError|Deprecated|EnumConstantNotPresentException|"+ + "ExceptionInInitializerError|IllegalAccessError|"+ + "IllegalThreadStateException|InstantiationError|InternalError|"+ + "NegativeArraySizeException|NoSuchFieldError|Override|Process|"+ + "ProcessBuilder|SecurityManager|StringIndexOutOfBoundsException|"+ + "SuppressWarnings|TypeNotPresentException|UnknownError|"+ + "UnsatisfiedLinkError|UnsupportedClassVersionError|VerifyError|"+ + "InstantiationException|IndexOutOfBoundsException|"+ + "ArrayIndexOutOfBoundsException|CloneNotSupportedException|"+ + "NoSuchFieldException|IllegalArgumentException|NumberFormatException|"+ + "SecurityException|Void|InheritableThreadLocal|IllegalStateException|"+ + "InterruptedException|NoSuchMethodException|IllegalAccessException|"+ + "UnsupportedOperationException|Enum|StrictMath|Package|Compiler|"+ + "Readable|Runtime|StringBuilder|Math|IncompatibleClassChangeError|"+ + "NoSuchMethodError|ThreadLocal|RuntimePermission|ArithmeticException|"+ + "NullPointerException|Long|Integer|Short|Byte|Double|Number|Float|"+ + "Character|Boolean|StackTraceElement|Appendable|StringBuffer|"+ + "Iterable|ThreadGroup|Runnable|Thread|IllegalMonitorStateException|"+ + "StackOverflowError|OutOfMemoryError|VirtualMachineError|"+ + "ArrayStoreException|ClassCastException|LinkageError|"+ + "NoClassDefFoundError|ClassNotFoundException|RuntimeException|"+ + "Exception|ThreadDeath|Error|Throwable|System|ClassLoader|"+ + "Cloneable|Class|CharSequence|Comparable|String|Object" + ); + + var keywordMapper = this.createKeywordMapper({ + "variable.language": "this", + "keyword": keywords, + "constant.language": "null", + "support.class" : langClasses, + "support.function" : "retract|update|modify|insert" + }, "identifier"); + + // regexp must not have capturing parentheses. Use (?:) instead. + // regexps are ordered -> the first match is used + + var stringRules = function() { + return [{ + token : "string", // single line + regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]' + }, { + token : "string", // single line + regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']" + }]; + }; + + + var basicPreRules = function(blockCommentRules) { + return [{ + token : "comment", + regex : "\\/\\/.*$" + }, + DocCommentHighlightRules.getStartRule("doc-start"), + { + token : "comment", // multi line comment + regex : "\\/\\*", + next : blockCommentRules + }, { + token : "constant.numeric", // hex + regex : "0[xX][0-9a-fA-F]+\\b" + }, { + token : "constant.numeric", // float + regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b" + }, { + token : "constant.language.boolean", + regex : "(?:true|false)\\b" + }]; + }; + + var blockCommentRules = function(returnRule) { + return [ + { + token : "comment.block", // closing comment + regex : ".*?\\*\\/", + next : returnRule + }, { + token : "comment.block", // comment spanning whole line + regex : ".+" + } + ]; + } + + var basicPostRules = function() { + return [{ + token : keywordMapper, + // TODO: Unicode escape sequences + // TODO: Unicode identifiers + regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b" + }, { + token : "keyword.operator", + regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)" + }, { + token : "lparen", + regex : "[[({]" + }, { + token : "rparen", + regex : "[\\])}]" + }, { + token : "text", + regex : "\\s+" + }]; + }; + + + this.$rules = { + "start" : [].concat(basicPreRules("block.comment"), [ + { + token : "entity.name.type", + regex : "@[a-zA-Z_$][a-zA-Z0-9_$]*\\b" + }, { + // package com.example + token : ["keyword","text","entity.name.type"], + regex : "(package)(\\s+)(" + packageIdentifierRe +")" + }, { + // import function com.Util.staticMethod + token : ["keyword","text","keyword","text","entity.name.type"], + regex : "(import)(\\s+)(function)(\\s+)(" + packageIdentifierRe +")" + }, { + // import function com.Util.staticMethod + token : ["keyword","text","entity.name.type"], + regex : "(import)(\\s+)(" + packageIdentifierRe +")" + }, { + // global com.example.Type identifier + token : ["keyword","text","entity.name.type","text","variable"], + regex : "(global)(\\s+)(" + packageIdentifierRe +")(\\s+)(" + identifierRe +")" + }, { + // declare trait DeclaredType + token : ["keyword","text","keyword","text","entity.name.type"], + regex : "(declare)(\\s+)(trait)(\\s+)(" + identifierRe +")" + }, { + // declare trait DeclaredType + token : ["keyword","text","entity.name.type"], + regex : "(declare)(\\s+)(" + identifierRe +")" + }, { + // declare trait DeclaredType + token : ["keyword","text","entity.name.type"], + regex : "(extends)(\\s+)(" + packageIdentifierRe +")" + }, { + // rule ... + token : ["keyword","text"], + regex : "(rule)(\\s+)", + next : "asset.name" + }], + stringRules(), + [{ + // variable : + token : ["variable.other","text","text"], + regex : "(" + identifierRe + ")(\\s*)(:)" + }, { + // query ... + token : ["keyword","text"], + regex : "(query)(\\s+)", + next : "asset.name" + }, { + // when ... + token : ["keyword","text"], + regex : "(when)(\\s*)" + }, { + // then end + token : ["keyword","text"], + regex : "(then)(\\s*)", + next : "java-start" + }, { + token : "paren.lparen", + regex : /[\[({]/ + }, { + token : "paren.rparen", + regex : /[\])}]/ + }], basicPostRules()), + "block.comment" : blockCommentRules("start"), + "asset.name" : [ + { + token : "entity.name", + regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]' + }, { + token : "entity.name", + regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']" + }, { + token : "entity.name", + regex : identifierRe + }, { + regex: "", + token: "empty", + next: "start" + }] + }; + this.embedRules(DocCommentHighlightRules, "doc-", + [ DocCommentHighlightRules.getEndRule("start") ]); + + this.embedRules(JavaHighlightRules, "java-", [ + { + token : "support.function", + regex: "\\b(insert|modify|retract|update)\\b" + }, { + token : "keyword", + regex: "\\bend\\b", + next : "start" + }]); + +}; + +oop.inherits(DroolsHighlightRules, TextHighlightRules); + +exports.DroolsHighlightRules = DroolsHighlightRules; +}); diff --git a/node_modules/ace/lib/ace/mode/folding/drools.js b/node_modules/ace/lib/ace/mode/folding/drools.js new file mode 100644 index 00000000..1eb6369c --- /dev/null +++ b/node_modules/ace/lib/ace/mode/folding/drools.js @@ -0,0 +1,49 @@ +define(function(require, exports, module) { +"use strict"; + +var oop = require("../../lib/oop"); +var Range = require("../../range").Range; +var BaseFoldMode = require("./fold_mode").FoldMode; +var TokenIterator = require("../../token_iterator").TokenIterator; + +var FoldMode = exports.FoldMode = function() {}; +oop.inherits(FoldMode, BaseFoldMode); + +(function() { + + // regular expressions that identify starting and stopping points + this.foldingStartMarker = /\b(rule|declare|query|when|then)\b/; + this.foldingStopMarker = /\bend\b/; + + this.getFoldWidgetRange = function(session, foldStyle, row) { + var line = session.getLine(row); + var match = line.match(this.foldingStartMarker); + if (match) { + var i = match.index; + + if (match[1]) { + var position = {row: row, column: line.length}; + var iterator = new TokenIterator(session, position.row, position.column); + var seek = "end"; + var token = iterator.getCurrentToken(); + if (token.value == "when") { + seek = "then"; + } + while (token) { + if (token.value == seek) { + return Range.fromPoints(position ,{ + row: iterator.getCurrentTokenRow(), + column: iterator.getCurrentTokenColumn() + }); + } + token = iterator.stepForward(); + } + } + + } + // test each line, and return a range of segments to collapse + } + +}).call(FoldMode.prototype); + +}); \ No newline at end of file diff --git a/node_modules/ace/lib/ace/mode/fortran.js b/node_modules/ace/lib/ace/mode/fortran.js new file mode 100644 index 00000000..fcac3935 --- /dev/null +++ b/node_modules/ace/lib/ace/mode/fortran.js @@ -0,0 +1,112 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Distributed under the BSD license: + * + * Copyright (c) 2010, Ajax.org B.V. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Ajax.org B.V. nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * ***** END LICENSE BLOCK ***** */ + +/* Derived from Python rules */ +define(function(require, exports, module) { +"use strict"; + +var oop = require("../lib/oop"); +var TextMode = require("./text").Mode; +var FortranHighlightRules = require("./fortran_highlight_rules").FortranHighlightRules; +var CStyleFoldMode = require("./folding/cstyle").FoldMode; +var Range = require("../range").Range; + +var Mode = function() { + this.HighlightRules = FortranHighlightRules; + this.foldingRules = new CStyleFoldMode(); +}; +oop.inherits(Mode, TextMode); + +(function() { + + this.lineCommentStart = "!"; + + this.getNextLineIndent = function(state, line, tab) { + var indent = this.$getIndent(line); + + var tokenizedLine = this.getTokenizer().getLineTokens(line, state); + var tokens = tokenizedLine.tokens; + + if (tokens.length && tokens[tokens.length-1].type == "comment") { + return indent; + } + + if (state == "start") { + var match = line.match(/^.*[\{\(\[\:]\s*$/); + if (match) { + indent += tab; + } + } + + return indent; + }; + + var outdents = { + "return": 1, + "break": 1, + "continue": 1, + "RETURN": 1, + "BREAK": 1, + "CONTINUE": 1 + }; + + this.checkOutdent = function(state, line, input) { + if (input !== "\r\n" && input !== "\r" && input !== "\n") + return false; + + var tokens = this.getTokenizer().getLineTokens(line.trim(), state).tokens; + + if (!tokens) + return false; + do { + var last = tokens.pop(); + } while (last && (last.type == "comment" || (last.type == "text" && last.value.match(/^\s+$/)))); + + if (!last) + return false; + + return (last.type == "keyword" && outdents[last.value]); + }; + + this.autoOutdent = function(state, doc, row) { + + row += 1; + var indent = this.$getIndent(doc.getLine(row)); + var tab = doc.getTabString(); + if (indent.slice(-tab.length) == tab) + doc.remove(new Range(row, indent.length-tab.length, row, indent.length)); + }; + + this.$id = "ace/mode/fortran"; +}).call(Mode.prototype); + +exports.Mode = Mode; +}); + diff --git a/node_modules/ace/lib/ace/mode/fortran_highlight_rules.js b/node_modules/ace/lib/ace/mode/fortran_highlight_rules.js new file mode 100644 index 00000000..8d50db54 --- /dev/null +++ b/node_modules/ace/lib/ace/mode/fortran_highlight_rules.js @@ -0,0 +1,233 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Distributed under the BSD license: + * + * Copyright (c) 2010, Ajax.org B.V. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Ajax.org B.V. nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * ***** END LICENSE BLOCK ***** */ + +/* Derived from Python highlighing rules */ + +define(function(require, exports, module) { +"use strict"; + +var oop = require("../lib/oop"); +var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; + +var FortranHighlightRules = function() { + + var keywords = ( + "call|case|contains|continue|cycle|do|else|elseif|end|enddo|endif|function|"+ + "if|implicit|in|include|inout|intent|module|none|only|out|print|program|return|"+ + "select|status|stop|subroutine|" + + "return|then|use|while|write|"+ + "CALL|CASE|CONTAINS|CONTINUE|CYCLE|DO|ELSE|ELSEIF|END|ENDDO|ENDIF|FUNCTION|"+ + "IF|IMPLICIT|IN|INCLUDE|INOUT|INTENT|MODULE|NONE|ONLY|OUT|PRINT|PROGRAM|RETURN|"+ + "SELECT|STATUS|STOP|SUBROUTINE|" + + "RETURN|THEN|USE|WHILE|WRITE" + ); + + var keywordOperators = ( + "and|or|not|eq|ne|gt|ge|lt|le|" + + "AND|OR|NOT|EQ|NE|GT|GE|LT|LE" + ); + + var builtinConstants = ( + "true|false|TRUE|FALSE" + ); + + var builtinFunctions = ( + "abs|achar|acos|acosh|adjustl|adjustr|aimag|aint|all|allocate|"+ + "anint|any|asin|asinh|associated|atan|atan2|atanh|"+ + "bessel_j0|bessel_j1|bessel_jn|bessel_y0|bessel_y1|bessel_yn|"+ + "bge|bgt|bit_size|ble|blt|btest|ceiling|char|cmplx|conjg|cos|cosh|"+ + "count|cpu_time|cshift|date_and_time|dble|deallocate|digits|dim|dot_product|dprod|"+ + "dshiftl|dshiftr|dsqrt|eoshift|epsilon|erf|erfc|erfc_scaled|exp|float|floor|"+ + "format|fraction|gamma|input|len|lge|lgt|lle|llt|log|log10|maskl|maskr|matmul|max|maxloc|maxval|"+ + "merge|min|minloc|minval|mod|modulo|nint|not|norm2|null|nullify|pack|parity|popcnt|poppar|"+ + "precision|present|product|radix|random_number|random_seed|range|repeat|reshape|round|"+ + "rrspacing|same_type_as|scale|scan|selected_char_kind|selected_int_kind|selected_real_kind|"+ + "set_exponent|shape|shifta|shiftl|shiftr|sign|sin|sinh|size|sngl|spacing|spread|"+ + "sqrt|sum|system_clock|tan|tanh|tiny|trailz|transfer|transpose|trim|ubound|unpack|verify|" + + "ABS|ACHAR|ACOS|ACOSH|ADJUSTL|ADJUSTR|AIMAG|AINT|ALL|ALLOCATE|"+ + "ANINT|ANY|ASIN|ASINH|ASSOCIATED|ATAN|ATAN2|ATANH|"+ + "BESSEL_J0|BESSEL_J1|BESSEL_JN|BESSEL_Y0|BESSEL_Y1|BESSEL_YN|"+ + "BGE|BGT|BIT_SIZE|BLE|BLT|BTEST|CEILING|CHAR|CMPLX|CONJG|COS|COSH|"+ + "COUNT|CPU_TIME|CSHIFT|DATE_AND_TIME|DBLE|DEALLOCATE|DIGITS|DIM|DOT_PRODUCT|DPROD|"+ + "DSHIFTL|DSHIFTR|DSQRT|EOSHIFT|EPSILON|ERF|ERFC|ERFC_SCALED|EXP|FLOAT|FLOOR|"+ + "FORMAT|FRACTION|GAMMA|INPUT|LEN|LGE|LGT|LLE|LLT|LOG|LOG10|MASKL|MASKR|MATMUL|MAX|MAXLOC|MAXVAL|"+ + "MERGE|MIN|MINLOC|MINVAL|MOD|MODULO|NINT|NOT|NORM2|NULL|NULLIFY|PACK|PARITY|POPCNT|POPPAR|"+ + "PRECISION|PRESENT|PRODUCT|RADIX|RANDOM_NUMBER|RANDOM_SEED|RANGE|REPEAT|RESHAPE|ROUND|"+ + "RRSPACING|SAME_TYPE_AS|SCALE|SCAN|SELECTED_CHAR_KIND|SELECTED_INT_KIND|SELECTED_REAL_KIND|"+ + "SET_EXPONENT|SHAPE|SHIFTA|SHIFTL|SHIFTR|SIGN|SIN|SINH|SIZE|SNGL|SPACING|SPREAD|"+ + "SQRT|SUM|SYSTEM_CLOCK|TAN|TANH|TINY|TRAILZ|TRANSFER|TRANSPOSE|TRIM|UBOUND|UNPACK|VERIFY" + ); + + var storageType = ( + "logical|character|integer|real|type|" + + "LOGICAL|CHARACTER|INTEGER|REAL|TYPE" + ); + + var storageModifiers = ( + "allocatable|dimension|intent|parameter|pointer|target|private|public|" + + "ALLOCATABLE|DIMENSION|INTENT|PARAMETER|POINTER|TARGET|PRIVATE|PUBLIC" + ); + + var keywordMapper = this.createKeywordMapper({ + "invalid.deprecated": "debugger", + "support.function": builtinFunctions, + "constant.language": builtinConstants, + "keyword": keywords, + "keyword.operator": keywordOperators, + "storage.type": storageType, + "storage.modifier" : storageModifiers + }, "identifier"); + + var strPre = "(?:r|u|ur|R|U|UR|Ur|uR)?"; + + var decimalInteger = "(?:(?:[1-9]\\d*)|(?:0))"; + var octInteger = "(?:0[oO]?[0-7]+)"; + var hexInteger = "(?:0[xX][\\dA-Fa-f]+)"; + var binInteger = "(?:0[bB][01]+)"; + var integer = "(?:" + decimalInteger + "|" + octInteger + "|" + hexInteger + "|" + binInteger + ")"; + + var exponent = "(?:[eE][+-]?\\d+)"; + var fraction = "(?:\\.\\d+)"; + var intPart = "(?:\\d+)"; + var pointFloat = "(?:(?:" + intPart + "?" + fraction + ")|(?:" + intPart + "\\.))"; + var exponentFloat = "(?:(?:" + pointFloat + "|" + intPart + ")" + exponent + ")"; + var floatNumber = "(?:" + exponentFloat + "|" + pointFloat + ")"; + + var stringEscape = "\\\\(x[0-9A-Fa-f]{2}|[0-7]{3}|[\\\\abfnrtv'\"]|U[0-9A-Fa-f]{8}|u[0-9A-Fa-f]{4})"; + + this.$rules = { + "start" : [ { + token : "comment", + regex : "!.*$" + }, { + token : "string", // multi line """ string start + regex : strPre + '"{3}', + next : "qqstring3" + }, { + token : "string", // " string + regex : strPre + '"(?=.)', + next : "qqstring" + }, { + token : "string", // multi line ''' string start + regex : strPre + "'{3}", + next : "qstring3" + }, { + token : "string", // ' string + regex : strPre + "'(?=.)", + next : "qstring" + }, { + token : "constant.numeric", // imaginary + regex : "(?:" + floatNumber + "|\\d+)[jJ]\\b" + }, { + token : "constant.numeric", // float + regex : floatNumber + }, { + token : "constant.numeric", // long integer + regex : integer + "[lL]\\b" + }, { + token : "constant.numeric", // integer + regex : integer + "\\b" + }, { + token : "keyword", // pre-compiler directives + regex : "#\\s*(?:include|import|define|undef|INCLUDE|IMPORT|DEFINE|UNDEF)\\b" + }, { + token : "keyword", // special case pre-compiler directive + regex : "#\\s*(?:endif|ifdef|else|elseif|ifndef|ENDIF|IFDEF|ELSE|ELSEIF|IFNDEF)\\b" + }, { + token : keywordMapper, + regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b" + }, { + token : "keyword.operator", + regex : "\\+|\\-|\\*|\\*\\*|\\/|\\/\\/|%|<<|>>|&|\\||\\^|~|<|>|<=|=>|==|!=|<>|=" + }, { + token : "paren.lparen", + regex : "[\\[\\(\\{]" + }, { + token : "paren.rparen", + regex : "[\\]\\)\\}]" + }, { + token : "text", + regex : "\\s+" + } ], + "qqstring3" : [ { + token : "constant.language.escape", + regex : stringEscape + }, { + token : "string", // multi line """ string end + regex : '"{3}', + next : "start" + }, { + defaultToken : "string" + } ], + "qstring3" : [ { + token : "constant.language.escape", + regex : stringEscape + }, { + token : "string", // multi line """ string end + regex : '"{3}', + next : "start" + }, { + defaultToken : "string" + } ], + "qqstring" : [{ + token : "constant.language.escape", + regex : stringEscape + }, { + token : "string", + regex : "\\\\$", + next : "qqstring" + }, { + token : "string", + regex : '"|$', + next : "start" + }, { + defaultToken: "string" + }], + "qstring" : [{ + token : "constant.language.escape", + regex : stringEscape + }, { + token : "string", + regex : "\\\\$", + next : "qstring" + }, { + token : "string", + regex : "'|$", + next : "start" + }, { + defaultToken: "string" + }] + }; +}; + +oop.inherits(FortranHighlightRules, TextHighlightRules); + +exports.FortranHighlightRules = FortranHighlightRules; +}); diff --git a/node_modules/ace/lib/ace/mode/handlebars.js b/node_modules/ace/lib/ace/mode/handlebars.js index 164ad43f..b29666ed 100644 --- a/node_modules/ace/lib/ace/mode/handlebars.js +++ b/node_modules/ace/lib/ace/mode/handlebars.js @@ -13,8 +13,6 @@ var Mode = function() { HtmlMode.call(this); this.HighlightRules = HandlebarsHighlightRules; this.$behaviour = new HtmlBehaviour(); - - this.foldingRules = new HtmlFoldMode(); }; oop.inherits(Mode, HtmlMode); diff --git a/node_modules/ace/lib/ace/mode/html_completions.js b/node_modules/ace/lib/ace/mode/html_completions.js index df5d4fda..72d61720 100644 --- a/node_modules/ace/lib/ace/mode/html_completions.js +++ b/node_modules/ace/lib/ace/mode/html_completions.js @@ -216,7 +216,7 @@ var attributeMap = { "label": {"form": 1, "for": 1}, "input": { "type": {"text": 1, "password": 1, "hidden": 1, "checkbox": 1, "submit": 1, "radio": 1, "file": 1, "button": 1, "reset": 1, "image": 31, "color": 1, "date": 1, "datetime": 1, "datetime-local": 1, "email": 1, "month": 1, "number": 1, "range": 1, "search": 1, "tel": 1, "time": 1, "url": 1, "week": 1}, - "accept": 1, "alt": 1, "autocomplete": {"on": 1, "off": 1}, "autofocus": {"autofocus": 1}, "checked": {"checked": 1}, "disabled": {"disabled": 1}, "form": 1, "formaction": 1, "formenctype": {"application/x-www-form-urlencoded": 1, "multipart/form-data": 1, "text/plain": 1}, "formmethod": {"get": 1, "post": 1}, "formnovalidate": {"formnovalidate": 1}, "formtarget": {"_blank": 1, "_self": 1, "_parent": 1, "_top": 1}, "height": 1, "list": 1, "max": 1, "maxlength": 1, "min": 1, "multiple": {"multiple": 1}, "pattern": 1, "placeholder": 1, "readonly": {"readonly": 1}, "required": {"required": 1}, "size": 1, "src": 1, "step": 1, "width": 1, "files": 1, "value": 1}, + "accept": 1, "alt": 1, "autocomplete": {"on": 1, "off": 1}, "autofocus": {"autofocus": 1}, "checked": {"checked": 1}, "disabled": {"disabled": 1}, "form": 1, "formaction": 1, "formenctype": {"application/x-www-form-urlencoded": 1, "multipart/form-data": 1, "text/plain": 1}, "formmethod": {"get": 1, "post": 1}, "formnovalidate": {"formnovalidate": 1}, "formtarget": {"_blank": 1, "_self": 1, "_parent": 1, "_top": 1}, "height": 1, "list": 1, "max": 1, "maxlength": 1, "min": 1, "multiple": {"multiple": 1}, "name": 1, "pattern": 1, "placeholder": 1, "readonly": {"readonly": 1}, "required": {"required": 1}, "size": 1, "src": 1, "step": 1, "width": 1, "files": 1, "value": 1}, "button": {"autofocus": 1, "disabled": {"disabled": 1}, "form": 1, "formaction": 1, "formenctype": 1, "formmethod": 1, "formnovalidate": 1, "formtarget": 1, "name": 1, "value": 1, "type": {"button": 1, "submit": 1}}, "select": {"autofocus": 1, "disabled": 1, "form": 1, "multiple": {"multiple": 1}, "name": 1, "size": 1, "readonly":{"readonly": 1}}, "datalist": {}, diff --git a/node_modules/ace/lib/ace/mode/javascript_worker.js b/node_modules/ace/lib/ace/mode/javascript_worker.js index fd5788e7..e1507c5a 100644 --- a/node_modules/ace/lib/ace/mode/javascript_worker.js +++ b/node_modules/ace/lib/ace/mode/javascript_worker.js @@ -125,7 +125,7 @@ oop.inherits(JavaScriptWorker, Mirror); var maxErrorLevel = this.isValidJS(value) ? "warning" : "error"; // var start = new Date(); - lint(value, this.options); + lint(value, this.options, this.options.globals); var results = lint.errors; var errorAdded = false diff --git a/node_modules/ace/lib/ace/mode/php_highlight_rules.js b/node_modules/ace/lib/ace/mode/php_highlight_rules.js index c8df2c99..135cd53e 100644 --- a/node_modules/ace/lib/ace/mode/php_highlight_rules.js +++ b/node_modules/ace/lib/ace/mode/php_highlight_rules.js @@ -846,7 +846,7 @@ var PhpLangHighlightRules = function() { ); var builtinConstants = lang.arrayToMap( - ('true|false|null|__CLASS__|__DIR__|__FILE__|__LINE__|__METHOD__|__FUNCTION__|__NAMESPACE__').split('|') + ('true|TRUE|false|FALSE|null|NULL|__CLASS__|__DIR__|__FILE__|__LINE__|__METHOD__|__FUNCTION__|__NAMESPACE__').split('|') ); var builtinVariables = lang.arrayToMap( diff --git a/node_modules/ace/lib/ace/mode/razor.js b/node_modules/ace/lib/ace/mode/razor.js new file mode 100644 index 00000000..d13c58e6 --- /dev/null +++ b/node_modules/ace/lib/ace/mode/razor.js @@ -0,0 +1,33 @@ +define(function(require, exports, module) { +"use strict"; + +var oop = require("../lib/oop"); +var HtmlMode = require("./html").Mode; +var RazorHighlightRules = require("./razor_highlight_rules").RazorHighlightRules; +var RazorCompletions = require("./razor_completions").RazorCompletions; +var HtmlCompletions = require("./html_completions").HtmlCompletions; + +var Mode = function() { + HtmlMode.call(this); + this.$highlightRules = new RazorHighlightRules(); + this.$completer = new RazorCompletions(); + this.$htmlCompleter = new HtmlCompletions(); +}; +oop.inherits(Mode, HtmlMode); + +(function() { + this.getCompletions = function(state, session, pos, prefix) { + var razorToken = this.$completer.getCompletions(state, session, pos, prefix); + var htmlToken = this.$htmlCompleter.getCompletions(state, session, pos, prefix); + return razorToken.concat(htmlToken); + }; + + this.createWorker = function(session) { + return null; + }; + + this.$id = "ace/mode/razor"; +}).call(Mode.prototype); + +exports.Mode = Mode; +}); diff --git a/node_modules/ace/lib/ace/mode/razor_completions.js b/node_modules/ace/lib/ace/mode/razor_completions.js new file mode 100644 index 00000000..c4ac6330 --- /dev/null +++ b/node_modules/ace/lib/ace/mode/razor_completions.js @@ -0,0 +1,112 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Distributed under the BSD license: + * + * Copyright (c) 2010, Ajax.org B.V. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Ajax.org B.V. nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * ***** END LICENSE BLOCK ***** */ + +define(function(require, exports, module) { +"use strict"; + +var TokenIterator = require("../token_iterator").TokenIterator; + +var keywords = [ + "abstract", "as", "base", "bool", + "break", "byte", "case", "catch", + "char", "checked", "class", "const", + "continue", "decimal", "default", "delegate", + "do", "double","else","enum", + "event", "explicit", "extern", "false", + "finally", "fixed", "float", "for", + "foreach", "goto", "if", "implicit", + "in", "int", "interface", "internal", + "is", "lock", "long", "namespace", + "new", "null", "object", "operator", + "out", "override", "params", "private", + "protected", "public", "readonly", "ref", + "return", "sbyte", "sealed", "short", + "sizeof", "stackalloc", "static", "string", + "struct", "switch", "this", "throw", + "true", "try", "typeof", "uint", + "ulong", "unchecked", "unsafe", "ushort", + "using", "var", "virtual", "void", + "volatile", "while"]; + +var shortHands = [ + "Html", "Model", "Url", "Layout" +]; + +var RazorCompletions = function() { + +}; + +(function() { + + this.getCompletions = function(state, session, pos, prefix) { + + if(state.lastIndexOf("razor-short-start") == -1 && state.lastIndexOf("razor-block-start") == -1) + return []; + + var token = session.getTokenAt(pos.row, pos.column); + if (!token) + return []; + + if(state.lastIndexOf("razor-short-start") != -1) { + return this.getShortStartCompletions(state, session, pos, prefix); + } + + if(state.lastIndexOf("razor-block-start") != -1) { + return this.getKeywordCompletions(state, session, pos, prefix); + } + + + }; + + this.getShortStartCompletions = function(state, session, pos, prefix) { + return shortHands.map(function(element){ + return { + value: element, + meta: "keyword", + score: Number.MAX_VALUE + }; + }); + }; + + this.getKeywordCompletions = function(state, session, pos, prefix) { + return shortHands.concat(keywords).map(function(element){ + return { + value: element, + meta: "keyword", + score: Number.MAX_VALUE + }; + }); + }; + +}).call(RazorCompletions.prototype); + +exports.RazorCompletions = RazorCompletions; + +}); diff --git a/node_modules/ace/lib/ace/mode/razor_highlight_rules.js b/node_modules/ace/lib/ace/mode/razor_highlight_rules.js new file mode 100644 index 00000000..f9ef223d --- /dev/null +++ b/node_modules/ace/lib/ace/mode/razor_highlight_rules.js @@ -0,0 +1,160 @@ +define(function(require, exports, module) { +"use strict"; + +var oop = require("../lib/oop"); +var lang = require("../lib/lang"); +var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules; +var HtmlHighlightRules = require("./html_highlight_rules").HtmlHighlightRules; +var CSharpHighlightRules = require("./csharp_highlight_rules").CSharpHighlightRules; + +var blockPrefix = 'razor-block-'; +var RazorLangHighlightRules = function() { + CSharpHighlightRules.call(this); + + var processPotentialCallback = function(value, stackItem) { + if (typeof stackItem === "function") + return stackItem(value); + + return stackItem; + }; + + var inBraces = 'in-braces'; + this.$rules.start.unshift({ + regex: '[\\[({]', + onMatch: function(value, state, stack) { + var prefix = /razor-[^\-]+-/.exec(state)[0]; + + stack.unshift(value); + stack.unshift(prefix + inBraces); + this.next = prefix + inBraces; + return 'paren.lparen'; + } + }, { + start: "@\\*", + end: "\\*@", + token: "comment" + }); + + var parentCloseMap = { + '{': '}', + '[': ']', + '(': ')' + }; + + this.$rules[inBraces] = lang.deepCopy(this.$rules.start); + this.$rules[inBraces].unshift({ + regex: '[\\])}]', + onMatch: function(value, state, stack) { + var open = stack[1]; + if (parentCloseMap[open] !== value) + return 'invalid.illegal'; + + stack.shift(); // exit in-braces block + stack.shift(); // exit brace marker + this.next = processPotentialCallback(value, stack[0]) || 'start'; + return 'paren.rparen'; + } + }); +}; + +oop.inherits(RazorLangHighlightRules, CSharpHighlightRules); + +var RazorHighlightRules = function() { + HtmlHighlightRules.call(this); + + // 'Blocks': @{}, @(), @functions{} + + var blockStartRule = { + regex: '@[({]|@functions{', + onMatch: function(value, state, stack) { + stack.unshift(value); + stack.unshift('razor-block-start'); + this.next = 'razor-block-start'; + return 'punctuation.block.razor'; + } + }; + + var blockEndMap = { + '@{': '}', + '@(': ')', + '@functions{':'}' + }; + + var blockEndRule = { + regex: '[})]', + onMatch: function(value, state, stack) { + var blockStart = stack[1]; + if (blockEndMap[blockStart] !== value) + return 'invalid.illegal'; + + stack.shift(); // exit razor block + stack.shift(); // remove block type marker + this.next = stack.shift() || 'start'; + return 'punctuation.block.razor'; + } + }; + + // Short: @Abc.Cde(Xyz).Ef + + var shortStartRule = { + regex: "@(?![{(])", + onMatch: function(value, state, stack) { + stack.unshift("razor-short-start"); + this.next = "razor-short-start"; + return 'punctuation.short.razor'; + } + }; + + var shortEndRule = { + token: "", + regex: "(?=[^A-Za-z_\\.()\\[\\]])", + next: 'pop' + }; + + // Control flow: @if, etc + + var ifStartRule = { + regex: "@(?=if)", + onMatch: function(value, state, stack) { + stack.unshift(function(value) { + if (value !== '}') + return 'start'; + + return stack.shift() || 'start'; + }); + this.next = 'razor-block-start'; + return 'punctuation.control.razor'; + } + }; + + // Combined: + + var razorStartRules = [ + { + start: "@\\*", + end: "\\*@", + token: "comment" + }, + { + token: ["meta.directive.razor", "text", "identifier"], + regex: "^(\\s*@model)(\\s+)(.+)$" + }, + blockStartRule, + //ifStartRule, + shortStartRule + ]; + + for (var key in this.$rules) + this.$rules[key].unshift.apply(this.$rules[key], razorStartRules); + + this.embedRules(RazorLangHighlightRules, "razor-block-", [blockEndRule], ["start"]); + this.embedRules(RazorLangHighlightRules, "razor-short-", [shortEndRule], ["start"]); + + this.normalizeRules(); +}; + +oop.inherits(RazorHighlightRules, HtmlHighlightRules); + +exports.RazorHighlightRules = RazorHighlightRules; +exports.RazorLangHighlightRules = RazorLangHighlightRules; +}); diff --git a/node_modules/ace/lib/ace/mode/rst.js b/node_modules/ace/lib/ace/mode/rst.js new file mode 100644 index 00000000..7e38b66e --- /dev/null +++ b/node_modules/ace/lib/ace/mode/rst.js @@ -0,0 +1,51 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Distributed under the BSD license: + * + * Copyright (c) 2015, Robin Jarry + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Ajax.org B.V. nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * ***** END LICENSE BLOCK ***** */ + +define(function(require, exports, module) { +"use strict"; + +var oop = require("../lib/oop"); +var TextMode = require("./text").Mode; +var RSTHighlightRules = require("./rst_highlight_rules").RSTHighlightRules; + +var Mode = function() { + this.HighlightRules = RSTHighlightRules; +}; +oop.inherits(Mode, TextMode); + +(function() { + this.type = "text"; + + this.$id = "ace/mode/rst"; +}).call(Mode.prototype); + +exports.Mode = Mode; + +}); diff --git a/node_modules/ace/lib/ace/mode/rst_highlight_rules.js b/node_modules/ace/lib/ace/mode/rst_highlight_rules.js new file mode 100644 index 00000000..7ff67ebf --- /dev/null +++ b/node_modules/ace/lib/ace/mode/rst_highlight_rules.js @@ -0,0 +1,296 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Distributed under the BSD license: + * + * Copyright (c) 2015, Robin Jarry + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Ajax.org B.V. nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * ***** END LICENSE BLOCK ***** */ + +define(function(require, exports, module) { +"use strict"; + +var oop = require("../lib/oop"); +var lang = require("../lib/lang"); +var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; + +var RSTHighlightRules = function() { + + var tokens = { + title: "markup.heading", + list: "markup.heading", + table: "constant", + directive: "keyword.operator", + entity: "string", + link: "markup.underline.list", + bold: "markup.bold", + italic: "markup.italic", + literal: "support.function", + comment: "comment" + }; + + var startStringPrefix = "(^|\\s|[\"'(<\\[{\\-/:])"; + var endStringSuffix = "(?:$|(?=\\s|[\\\\.,;!?\\-/:\"')>\\]}]))"; + + this.$rules = { + "start": [ + /* NB: Only the underline of the heading is highlighted. + * ACE tokenizer does not allow backtracking, the underlined text of the + * heading cannot be highlighted. */ + { + token : tokens.title, + regex : "(^)([\\=\\-`:\\.'\"~\\^_\\*\\+#])(\\2{2,}\\s*$)" + }, + /* Generic directive syntax (e.g. .. code-block:: c) + * All of the directive body is highlighted as a code block. */ + { + token : ["text", tokens.directive, tokens.literal], + regex : "(^\\s*\\.\\. )([^: ]+::)(.*$)", + next : "codeblock" + }, + { + token : tokens.directive, + regex : "::$", + next : "codeblock" + }, + /* Link/anchor definitions */ + { + token : [tokens.entity, tokens.link], + regex : "(^\\.\\. _[^:]+:)(.*$)" + }, + { + token : [tokens.entity, tokens.link], + regex : "(^__ )(https?://.*$)" + }, + /* Footnote definition */ + { + token : tokens.entity, + regex : "^\\.\\. \\[[^\\]]+\\] " + }, + /* Comment block start */ + { + token : tokens.comment, + regex : "^\\.\\. .*$", + next : "comment" + }, + /* List items */ + { + token : tokens.list, + regex : "^\\s*[\\*\\+-] " + }, + { + token : tokens.list, + regex : "^\\s*(?:[A-Za-z]|[0-9]+|[ivxlcdmIVXLCDM]+)\\. " + }, + { + token : tokens.list, + regex : "^\\s*\\(?(?:[A-Za-z]|[0-9]+|[ivxlcdmIVXLCDM]+)\\) " + }, + /* "Simple" tables */ + { + token : tokens.table, + regex : "^={2,}(?: +={2,})+$" + }, + /* "Grid" tables */ + { + token : tokens.table, + regex : "^\\+-{2,}(?:\\+-{2,})+\\+$" + }, + { + token : tokens.table, + regex : "^\\+={2,}(?:\\+={2,})+\\+$" + }, + /* Inline markup */ + { + token : ["text", tokens.literal], + regex : startStringPrefix + "(``)(?=\\S)", + next : "code" + }, + { + token : ["text", tokens.bold], + regex : startStringPrefix + "(\\*\\*)(?=\\S)", + next : "bold" + }, + { + token : ["text", tokens.italic], + regex : startStringPrefix + "(\\*)(?=\\S)", + next : "italic" + }, + /* Substitution reference */ + { + token : tokens.entity, + regex : "\\|[\\w\\-]+?\\|" + }, + /* Link/footnote references */ + { + token : tokens.entity, + regex : ":[\\w-:]+:`\\S", + next : "entity" + }, + { + token : ["text", tokens.entity], + regex : startStringPrefix + "(_`)(?=\\S)", + next : "entity" + }, + { + token : tokens.entity, + regex : "_[A-Za-z0-9\\-]+?" + }, + { + token : ["text", tokens.link], + regex : startStringPrefix + "(`)(?=\\S)", + next : "link" + }, + { + token : tokens.link, + regex : "[A-Za-z0-9\\-]+?__?" + }, + { + token : tokens.link, + regex : "\\[[^\\]]+?\\]_" + }, + { + token : tokens.link, + regex : "https?://\\S+" + }, + /* "Grid" tables column separator + * This is at the end to make it lower priority over all other rules. */ + { + token : tokens.table, + regex : "\\|" + } + ], + + /* This state is used for all directive bodies and literal blocks. + * The parser returns to the "start" state when reaching the first + * non-empty line that does not start with at least one space. */ + "codeblock": [ + { + token : tokens.literal, + regex : "^ +.+$", + next : "codeblock" + }, + { + token : tokens.literal, + regex : '^$', + next: "codeblock" + }, + { + token : "empty", + regex : "", + next : "start" + } + ], + + /* Inline code + * The parser returns to the "start" state when reaching "``" */ + "code": [ + { + token : tokens.literal, + regex : "\\S``" + endStringSuffix, + next : "start" + }, + { + defaultToken: tokens.literal + } + ], + + /* Bold (strong) text + * The parser returns to the "start" state when reaching "**" */ + "bold": [ + { + token : tokens.bold, + regex : "\\S\\*\\*" + endStringSuffix, + next : "start" + }, + { + defaultToken: tokens.bold + } + ], + + /* Italic (emphasis) text + * The parser returns to the "start" state when reaching "*" */ + "italic": [ + { + token : tokens.italic, + regex : "\\S\\*" + endStringSuffix, + next : "start" + }, + { + defaultToken: tokens.italic + } + ], + + /* Explicit role/class text or link anchor definition + * The parser returns to the "start" state when reaching "`" */ + "entity": [ + { + token : tokens.entity, + regex : "\\S`" + endStringSuffix, + next : "start" + }, + { + defaultToken: tokens.entity + } + ], + + /* Link reference + * The parser returns to the "start" state when reaching "`_" or "`__" */ + "link": [ + { + token : tokens.link, + regex : "\\S`__?" + endStringSuffix, + next : "start" + }, + { + defaultToken: tokens.link + } + ], + + /* Comment block. + * The parser returns to the "start" state when reaching the first + * non-empty line that does not start with at least one space. */ + "comment": [ + { + token : tokens.comment, + regex : "^ +.+$", + next : "comment" + }, + { + token : tokens.comment, + regex : '^$', + next: "comment" + }, + { + token : "empty", + regex : "", + next : "start" + } + ] + }; +}; +oop.inherits(RSTHighlightRules, TextHighlightRules); + +exports.RSTHighlightRules = RSTHighlightRules; +}); diff --git a/node_modules/ace/lib/ace/mode/rust_highlight_rules.js b/node_modules/ace/lib/ace/mode/rust_highlight_rules.js index 5e56c542..443dc10e 100644 --- a/node_modules/ace/lib/ace/mode/rust_highlight_rules.js +++ b/node_modules/ace/lib/ace/mode/rust_highlight_rules.js @@ -36,7 +36,7 @@ define(function(require, exports, module) { var oop = require("../lib/oop"); var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; -var stringEscape = /\\(?:[nrt0'"]|x[\da-fA-F]{2}|u\{[\da-fA-F]{6}\})/.source; +var stringEscape = /\\(?:[nrt0'"\\]|x[\da-fA-F]{2}|u\{[\da-fA-F]{6}\})/.source; var RustHighlightRules = function() { // regexp must not have capturing parentheses. Use (?:) instead. // regexps are ordered -> the first match is used diff --git a/node_modules/ace/lib/ace/mode/text.js b/node_modules/ace/lib/ace/mode/text.js index bd9b00ed..d780fdb8 100644 --- a/node_modules/ace/lib/ace/mode/text.js +++ b/node_modules/ace/lib/ace/mode/text.js @@ -33,7 +33,7 @@ define(function(require, exports, module) { var Tokenizer = require("../tokenizer").Tokenizer; var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; -var Behaviour = require("./behaviour").Behaviour; +var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour; var unicode = require("../unicode"); var lang = require("../lib/lang"); var TokenIterator = require("../token_iterator").TokenIterator; @@ -41,10 +41,10 @@ var Range = require("../range").Range; var Mode = function() { this.HighlightRules = TextHighlightRules; - this.$behaviour = new Behaviour(); }; (function() { + this.$behaviour = new CstyleBehaviour(); this.tokenRe = new RegExp("^[" + unicode.packages.L @@ -62,7 +62,7 @@ var Mode = function() { this.getTokenizer = function() { if (!this.$tokenizer) { - this.$highlightRules = this.$highlightRules || new this.HighlightRules(); + this.$highlightRules = this.$highlightRules || new this.HighlightRules(this.$highlightRuleConfig); this.$tokenizer = new Tokenizer(this.$highlightRules.getRules()); } return this.$tokenizer; diff --git a/node_modules/ace/lib/ace/mode/tsx.js b/node_modules/ace/lib/ace/mode/tsx.js new file mode 100644 index 00000000..81c038d0 --- /dev/null +++ b/node_modules/ace/lib/ace/mode/tsx.js @@ -0,0 +1,52 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Distributed under the BSD license: + * + * Copyright (c) 2012, Ajax.org B.V. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Ajax.org B.V. nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * ***** END LICENSE BLOCK ***** */ + +/* + THIS FILE WAS AUTOGENERATED BY mode.tmpl.js +*/ + +define(function(require, exports, module) { +"use strict"; + +var oop = require("../lib/oop"); +var tsMode = require("./typescript").Mode; + +var Mode = function() { + tsMode.call(this); + this.$highlightRuleConfig = {jsx: true}; +}; +oop.inherits(Mode, tsMode); + +(function() { + this.$id = "ace/mode/tsx"; +}).call(Mode.prototype); + +exports.Mode = Mode; +}); \ No newline at end of file diff --git a/node_modules/ace/lib/ace/scrollbar.js b/node_modules/ace/lib/ace/scrollbar.js index 465c6942..e8454a07 100644 --- a/node_modules/ace/lib/ace/scrollbar.js +++ b/node_modules/ace/lib/ace/scrollbar.js @@ -35,6 +35,7 @@ var oop = require("./lib/oop"); var dom = require("./lib/dom"); var event = require("./lib/event"); var EventEmitter = require("./lib/event_emitter").EventEmitter; +var MAX_SCROLL_H = 0x8000; /** * An abstract class representing a native scrollbar control. @@ -70,6 +71,7 @@ var ScrollBar = function(parent) { this.setVisible = function(isVisible) { this.element.style.display = isVisible ? "" : "none"; this.isVisible = isVisible; + this.coeff = 1; }; }).call(ScrollBar.prototype); @@ -114,7 +116,7 @@ oop.inherits(VScrollBar, ScrollBar); **/ this.onScroll = function() { if (!this.skipEvent) { - this.scrollTop = this.element.scrollTop; + this.scrollTop = this.element.scrollTop / this.coeff; this._emit("scroll", {data: this.scrollTop}); } this.skipEvent = false; @@ -141,15 +143,18 @@ oop.inherits(VScrollBar, ScrollBar); * @param {Number} height The new inner height * @deprecated Use setScrollHeight instead **/ - this.setInnerHeight = function(height) { - this.inner.style.height = height + "px"; - }; - + this.setInnerHeight = /** * Sets the scroll height of the scroll bar, in pixels. * @param {Number} height The new scroll height **/ this.setScrollHeight = function(height) { + if (height > MAX_SCROLL_H) { + this.coeff = MAX_SCROLL_H / height; + height = MAX_SCROLL_H; + } else if (this.coeff != 1) { + this.coeff = 1 + } this.inner.style.height = height + "px"; }; @@ -162,7 +167,8 @@ oop.inherits(VScrollBar, ScrollBar); // this.element.scrollTop != scrollTop which makes page to scroll up. if (this.scrollTop != scrollTop) { this.skipEvent = true; - this.scrollTop = this.element.scrollTop = scrollTop; + this.scrollTop = scrollTop; + this.element.scrollTop = scrollTop * this.coeff; } }; diff --git a/node_modules/ace/lib/ace/snippets/drools.js b/node_modules/ace/lib/ace/snippets/drools.js new file mode 100644 index 00000000..c578eae4 --- /dev/null +++ b/node_modules/ace/lib/ace/snippets/drools.js @@ -0,0 +1,7 @@ +define(function(require, exports, module) { +"use strict"; + +exports.snippetText = require("../requirejs/text!./drools.snippets"); +exports.scope = "drools"; + +}); diff --git a/node_modules/ace/lib/ace/snippets/drools.snippets b/node_modules/ace/lib/ace/snippets/drools.snippets new file mode 100644 index 00000000..3687bec1 --- /dev/null +++ b/node_modules/ace/lib/ace/snippets/drools.snippets @@ -0,0 +1,19 @@ + +snippet rule + rule "${1?:rule_name}" + when + ${2:// when...} + then + ${3:// then...} + end + +snippet query + query ${1?:query_name} + ${2:// find} + end + +snippet declare + declare ${1?:type_name} + ${2:// attributes} + end + diff --git a/node_modules/ace/lib/ace/snippets/f.js b/node_modules/ace/lib/ace/snippets/f.js new file mode 100644 index 00000000..359d9103 --- /dev/null +++ b/node_modules/ace/lib/ace/snippets/f.js @@ -0,0 +1,7 @@ +define(function(require, exports, module) { +"use strict"; + +exports.snippetText = require("../requirejs/text!./.snippets"); +exports.scope = ""; + +}); diff --git a/node_modules/ace/lib/ace/snippets/fortran.js b/node_modules/ace/lib/ace/snippets/fortran.js new file mode 100644 index 00000000..65d8a0d9 --- /dev/null +++ b/node_modules/ace/lib/ace/snippets/fortran.js @@ -0,0 +1,7 @@ +define(function(require, exports, module) { +"use strict"; + +exports.snippetText = require("../requirejs/text!./fortran.snippets"); +exports.scope = "fortran"; + +}); diff --git a/node_modules/ace/lib/ace/snippets/fortran.snippets b/node_modules/ace/lib/ace/snippets/fortran.snippets new file mode 100644 index 00000000..e69de29b diff --git a/node_modules/ace/lib/ace/snippets/fsharp.js b/node_modules/ace/lib/ace/snippets/fsharp.js new file mode 100644 index 00000000..38ee2167 --- /dev/null +++ b/node_modules/ace/lib/ace/snippets/fsharp.js @@ -0,0 +1,7 @@ +define(function(require, exports, module) { +"use strict"; + +exports.snippetText = require("../requirejs/text!./fsharp.snippets"); +exports.scope = "fsharp"; + +}); diff --git a/node_modules/ace/lib/ace/snippets/fsharp.snippets b/node_modules/ace/lib/ace/snippets/fsharp.snippets new file mode 100644 index 00000000..e69de29b diff --git a/node_modules/ace/lib/ace/snippets/razor.js b/node_modules/ace/lib/ace/snippets/razor.js new file mode 100644 index 00000000..bfee3230 --- /dev/null +++ b/node_modules/ace/lib/ace/snippets/razor.js @@ -0,0 +1,7 @@ +define(function(require, exports, module) { +"use strict"; + +exports.snippetText = require("../requirejs/text!./razor.snippets"); +exports.scope = "razor"; + +}); diff --git a/node_modules/ace/lib/ace/snippets/razor.snippets b/node_modules/ace/lib/ace/snippets/razor.snippets new file mode 100644 index 00000000..f851b054 --- /dev/null +++ b/node_modules/ace/lib/ace/snippets/razor.snippets @@ -0,0 +1,4 @@ +snippet if +(${1} == ${2}) { + ${3} +} \ No newline at end of file diff --git a/node_modules/ace/lib/ace/theme/gruvbox.css b/node_modules/ace/lib/ace/theme/gruvbox.css new file mode 100644 index 00000000..e8d72de7 --- /dev/null +++ b/node_modules/ace/lib/ace/theme/gruvbox.css @@ -0,0 +1,122 @@ +.ace-gruvbox .ace_gutter { + background: #282828; + color: #a89984; +} + +.ace-gruvbox .ace_print-margin { + width: 1px; + background: #555651 +} + +.ace-gruvbox { + background-color: #282828; + color: #ebdbb2 +} + +.ace-gruvbox .ace_cursor { + color: #F8F8F0 +} + +.ace-gruvbox .ace_marker-layer .ace_selection { + background: #3c3836; +} + +.ace-gruvbox.ace_multiselect .ace_selection.ace_start { + box-shadow: 0 0 3px 0px #3c3836; +} + +.ace-gruvbox .ace_marker-layer .ace_step { + background: #32302f; +} + +.ace-gruvbox .ace_marker-layer .ace_bracket { + margin: -1px 0 0 -1px; + border: 1px solid #f38019; +} + +.ace-gruvbox .ace_marker-layer .ace_active-line { + background: #3c3836; +} + +.ace-gruvbox .ace_gutter-active-line { + background-color: #3c3836; +} + +.ace-gruvbox .ace_marker-layer .ace_selected-word { + border: 1px solid #3c3836; +} + +.ace-gruvbox .ace_invisible { + color: #3c3836 +} + +.ace-gruvbox .ace_entity.ace_name.ace_tag, +.ace-gruvbox .ace_keyword, +.ace-gruvbox .ace_meta.ace_tag, +.ace-gruvbox .ace_storage { + color: #fb4934 +} + +.ace-gruvbox .ace_punctuation, +.ace-gruvbox .ace_punctuation.ace_tag { + color: #fff +} + +.ace-gruvbox .ace_constant.ace_character, +.ace-gruvbox .ace_constant.ace_language, +.ace-gruvbox .ace_constant.ace_numeric, +.ace-gruvbox .ace_constant.ace_other { + color: #83a598 +} + +.ace-gruvbox .ace_invalid { + color: #F8F8F0; + background-color: #d3869b; +} + +.ace-gruvbox .ace_invalid.ace_deprecated { + color: #F8F8F0; + background-color: #83a598; +} + +.ace-gruvbox .ace_support.ace_constant, +.ace-gruvbox .ace_support.ace_function { + color: #83a598 +} + +.ace-gruvbox .ace_fold { + background-color: #a3aa20; + border-color: #F8F8F2 +} + +.ace-gruvbox .ace_storage.ace_type, +.ace-gruvbox .ace_support.ace_class, +.ace-gruvbox .ace_support.ace_type { + font-style: italic; + color: #ebaa27 +} + +.ace-gruvbox .ace_entity.ace_name.ace_function, +.ace-gruvbox .ace_entity.ace_other, +.ace-gruvbox .ace_entity.ace_other.ace_attribute-name, +.ace-gruvbox .ace_variable { + color: #a3aa20 +} + +.ace-gruvbox .ace_variable.ace_parameter { + font-style: italic; + color: #fabd2f +} + +.ace-gruvbox .ace_string { + color: #ebdbb2; +} + +.ace-gruvbox .ace_comment { + color: #665c54; + font-style: italic; +} + +.ace-gruvbox .ace_indent-guide { + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWPQ0FD0ZXBzd/wPAAjVAoxeSgNeAAAAAElFTkSuQmCC) right repeat-y +} \ No newline at end of file diff --git a/node_modules/ace/lib/ace/theme/gruvbox.js b/node_modules/ace/lib/ace/theme/gruvbox.js new file mode 100644 index 00000000..2925afc8 --- /dev/null +++ b/node_modules/ace/lib/ace/theme/gruvbox.js @@ -0,0 +1,9 @@ +define(function(require, exports, module) { + + exports.isDark = true; + exports.cssClass = "ace-gruvbox"; + exports.cssText = require("../requirejs/text!./gruvbox.css"); + + var dom = require("../lib/dom"); + dom.importCssString(exports.cssText, exports.cssClass); +}); diff --git a/node_modules/ace/lib/ace/virtual_renderer.js b/node_modules/ace/lib/ace/virtual_renderer.js index d25d76e3..fd213c0c 100644 --- a/node_modules/ace/lib/ace/virtual_renderer.js +++ b/node_modules/ace/lib/ace/virtual_renderer.js @@ -1033,7 +1033,7 @@ var VirtualRenderer = function(container, theme) { minHeight : minHeight, maxHeight : maxHeight, offset : offset, - gutterOffset : Math.max(0, Math.ceil((offset + size.height - size.scrollerHeight) / lineHeight)), + gutterOffset : lineHeight ? Math.max(0, Math.ceil((offset + size.height - size.scrollerHeight) / lineHeight)) : 0, height : this.$size.scrollerHeight }; diff --git a/settings/standalone.js b/settings/standalone.js index 2d078567..178905aa 100644 --- a/settings/standalone.js +++ b/settings/standalone.js @@ -63,6 +63,7 @@ module.exports = function(manifest, installPath) { ideBaseUrl: "http://c9.io", previewUrl: "/preview", dashboardUrl: "https://c9.io/dashboard.html", + accountUrl: "https://c9.io/account", apiUrl: "/api", homeUrl: "/home", collab: false, From 93edc13d4200262feebf512fe1155eebe27e46b1 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 5 Apr 2016 17:39:16 +0200 Subject: [PATCH 051/160] c9-auto-bump 3.1.2065 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 83875612..d93defa4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2064", + "version": "3.1.2065", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 54c73068c797d3dd323d0ec8d2adcf5314c8101c Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 5 Apr 2016 18:54:28 +0200 Subject: [PATCH 052/160] c9-auto-bump 3.1.2066 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d93defa4..8c92ef60 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2065", + "version": "3.1.2066", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 30db19405e2e4da2b6cc68ab92c61a20d5afc73c Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 5 Apr 2016 19:45:07 +0200 Subject: [PATCH 053/160] c9-auto-bump 3.1.2067 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8c92ef60..5c0e19c4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2066", + "version": "3.1.2067", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From f2fd12c9dabb04429ab61eb1ea057b55439c5dcf Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 6 Apr 2016 09:54:26 +0200 Subject: [PATCH 054/160] c9-auto-bump 3.1.2068 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5c0e19c4..8ac096fc 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2067", + "version": "3.1.2068", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From f218a50c5f9a81ee5ced65fe8b3255e6e378eb1b Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 6 Apr 2016 10:43:44 +0200 Subject: [PATCH 055/160] c9-auto-bump 3.1.2069 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8ac096fc..9458b713 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2068", + "version": "3.1.2069", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 04cd4eb59ef4605ae361cab5056a34d8a73b939f Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 6 Apr 2016 11:09:20 +0200 Subject: [PATCH 056/160] c9-auto-bump 3.1.2070 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9458b713..92b44d80 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2069", + "version": "3.1.2070", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 66eb6f8d9fc6989e8ac33d243fbd87839279d94b Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 6 Apr 2016 11:09:40 +0200 Subject: [PATCH 057/160] c9-auto-bump 3.1.2071 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 92b44d80..3b085fb3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2070", + "version": "3.1.2071", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 33f9379edd912f7fe9d3bfda8a66d7d5fcbccabf Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 6 Apr 2016 11:31:40 +0200 Subject: [PATCH 058/160] c9-auto-bump 3.1.2072 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3b085fb3..59af5b0a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2071", + "version": "3.1.2072", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From bff017ea0c7f30b583b1209d926140382a0969b9 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 6 Apr 2016 11:37:44 +0200 Subject: [PATCH 059/160] c9-auto-bump 3.1.2073 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 59af5b0a..3e6eba55 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2072", + "version": "3.1.2073", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 6415b27f26c08e3a28de5434649ec1c1f33a229c Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Wed, 6 Apr 2016 09:59:35 +0000 Subject: [PATCH 060/160] make sure to always send an error object to raygun --- plugins/c9.error/raygun.connect.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/c9.error/raygun.connect.js b/plugins/c9.error/raygun.connect.js index 922eae90..10c8d183 100644 --- a/plugins/c9.error/raygun.connect.js +++ b/plugins/c9.error/raygun.connect.js @@ -84,6 +84,9 @@ function plugin(options, imports, register) { } function _sendRequest(raygunClient, err, req) { + if (typeof err == "string") + err = new Error(err); + var parsedUrl = url.parse(req.url, false); var ip = req.remoteAddress; From a6f0bbd5ddaf07a22510db4c93b01d89962fd703 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 6 Apr 2016 12:46:23 +0200 Subject: [PATCH 061/160] c9-auto-bump 3.1.2074 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3e6eba55..48c1ae7d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2073", + "version": "3.1.2074", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 7881c664e5d1b8bafdc471d5a40039da93cd82f7 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 6 Apr 2016 14:02:49 +0200 Subject: [PATCH 062/160] c9-auto-bump 3.1.2075 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 48c1ae7d..a9d58537 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2074", + "version": "3.1.2075", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 482072ac388274dfebc135ec6d3500e3fd7eaf9d Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 6 Apr 2016 14:34:58 +0200 Subject: [PATCH 063/160] c9-auto-bump 3.1.2076 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a9d58537..3e80b7f3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2075", + "version": "3.1.2076", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 37b51caec145122751c61bfb7d3b6e480877f66d Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 6 Apr 2016 14:59:11 +0200 Subject: [PATCH 064/160] c9-auto-bump 3.1.2077 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3e80b7f3..e1a05dc1 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2076", + "version": "3.1.2077", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From b9a4ed73481286ae1e0f822a0edb2dba741f69d8 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 6 Apr 2016 15:19:19 +0200 Subject: [PATCH 065/160] c9-auto-bump 3.1.2078 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e1a05dc1..bea0d8e2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2077", + "version": "3.1.2078", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 1dbf3f101723c841dfaa7402dfc77e981c901828 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 6 Apr 2016 15:19:53 +0200 Subject: [PATCH 066/160] c9-auto-bump 3.1.2079 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bea0d8e2..97e9b3b5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2078", + "version": "3.1.2079", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 212a7dcbddf9635dd2ab84b2491f92ef0a46976c Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 6 Apr 2016 15:21:08 +0200 Subject: [PATCH 067/160] c9-auto-bump 3.1.2080 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 97e9b3b5..d72cc2b4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2079", + "version": "3.1.2080", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 232f37d4132d88eb953d3ec9b1aa33eb92079c98 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 6 Apr 2016 15:39:16 +0200 Subject: [PATCH 068/160] c9-auto-bump 3.1.2081 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d72cc2b4..4ad7ff1e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2080", + "version": "3.1.2081", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 4bd941c0ef7b27fc5915bb7133a77032813b3b09 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 6 Apr 2016 15:44:17 +0200 Subject: [PATCH 069/160] c9-auto-bump 3.1.2082 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4ad7ff1e..5937fc1f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2081", + "version": "3.1.2082", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From e8ab166bd3e07d13748bd82092401bf8c93e4e9e Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 6 Apr 2016 15:51:10 +0200 Subject: [PATCH 070/160] c9-auto-bump 3.1.2083 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5937fc1f..a2c6129e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2082", + "version": "3.1.2083", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From ad764c15a8b7db3c2225fd7673d00c700974a4ca Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 6 Apr 2016 15:56:00 +0200 Subject: [PATCH 071/160] c9-auto-bump 3.1.2084 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a2c6129e..74ef4c43 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2083", + "version": "3.1.2084", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 8dc4630399611ec04322f5dbc4d8aeef9a783fa4 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 6 Apr 2016 16:16:47 +0200 Subject: [PATCH 072/160] c9-auto-bump 3.1.2085 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 74ef4c43..98c10678 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2084", + "version": "3.1.2085", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From d311a9d09d2e734f6cf09601e17a9ae168ec6600 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 6 Apr 2016 16:32:17 +0200 Subject: [PATCH 073/160] c9-auto-bump 3.1.2086 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 98c10678..f3089b7f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2085", + "version": "3.1.2086", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 92f5ecdecd2db973a249027ece6648db5ce67745 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 6 Apr 2016 16:54:24 +0200 Subject: [PATCH 074/160] c9-auto-bump 3.1.2087 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f3089b7f..fc69d2d5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2086", + "version": "3.1.2087", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From ff11559ec77a571730200c235174b9b7f1e46f3f Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 6 Apr 2016 16:56:29 +0200 Subject: [PATCH 075/160] c9-auto-bump 3.1.2088 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fc69d2d5..5a835dcf 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2087", + "version": "3.1.2088", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 23ff98ff33e05647b6a49c04426a287353bc4012 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 6 Apr 2016 17:01:45 +0200 Subject: [PATCH 076/160] c9-auto-bump 3.1.2089 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5a835dcf..0a4a6fae 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2088", + "version": "3.1.2089", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 56d5fc8f95a8105450fc1a80a1ccd513a89f02bd Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Wed, 6 Apr 2016 15:24:54 +0000 Subject: [PATCH 077/160] configure based on provider --- server.js | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/server.js b/server.js index 704ea32b..3ac3c1bb 100755 --- a/server.js +++ b/server.js @@ -142,6 +142,32 @@ function expandShortCuts(configs) { return results; } +function loadSettings(settingsName) { + var provider = hostname.parse(os.hostname()).provider; + var candidates = [ + path.join(__dirname, "./settings", settingsName + "-" + provider), + path.join(__dirname, "./settings", settingsName) + ]; + + var settings, settingsModule; + + for (var i = 0; i < candidates.length; i++) { + var settingsPath = candidates[i]; + try { + settingsModule = require(settingsPath); + } catch (e) { + continue; + } + settings = settingsModule(); + break; + + } + if (!settings) + throw new Error("No settings found"); + + return settings; +} + function start(configName, options, callback) { console.log("Starting", configName); @@ -155,7 +181,7 @@ function start(configName, options, callback) { if (configPath[0] !== "/") configPath = path.join(__dirname, "/configs/", configName); - var settings = require(path.join(__dirname, "./settings", settingsName))(); + var settings = loadSettings(settingsName); argv.domains = argv.domains || settings.domains; if (settings.c9 && argv.domains) From 0dfc032abf6c56d1c516d220528f3b37908bdf73 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 6 Apr 2016 17:29:23 +0200 Subject: [PATCH 078/160] c9-auto-bump 3.1.2090 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0a4a6fae..a9222a9d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2089", + "version": "3.1.2090", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From de358084621aae223e3cb41a4462211edf830dbd Mon Sep 17 00:00:00 2001 From: Tim Robinson Date: Wed, 6 Apr 2016 16:34:34 +0000 Subject: [PATCH 079/160] Create 4096 bit keys --- node_modules/c9/ssh.js | 1 + 1 file changed, 1 insertion(+) diff --git a/node_modules/c9/ssh.js b/node_modules/c9/ssh.js index 833b9365..c7352b7a 100644 --- a/node_modules/c9/ssh.js +++ b/node_modules/c9/ssh.js @@ -123,6 +123,7 @@ exports.generateKeyPair = function(email, callback) { var phrase = ""; var command = "ssh-keygen -t rsa " + + "-b 4096 " + "-f \"" + filename + "\" " + "-P \"" + phrase + "\" " + "-C \"" + email + "\" "; From 055cba61c507d33132c2d42111d69ef2e3454dd4 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 6 Apr 2016 20:50:18 +0200 Subject: [PATCH 080/160] c9-auto-bump 3.1.2091 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a9222a9d..4167bbdf 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2090", + "version": "3.1.2091", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 14e1fc7910af41b2006a9eeccb06f80690fea564 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 6 Apr 2016 22:51:28 +0200 Subject: [PATCH 081/160] c9-auto-bump 3.1.2092 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4167bbdf..879c11dd 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2091", + "version": "3.1.2092", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 872dde37ac997acc647f6064bddc987d5e7f916b Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 7 Apr 2016 00:07:03 +0200 Subject: [PATCH 082/160] c9-auto-bump 3.1.2093 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 879c11dd..ec7fffe5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2092", + "version": "3.1.2093", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 8d6408217b9378aeceef684b4e160d83d1ec9da1 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 7 Apr 2016 00:51:47 +0200 Subject: [PATCH 083/160] c9-auto-bump 3.1.2094 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ec7fffe5..93b57859 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2093", + "version": "3.1.2094", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From dc7e09e76c3c9b034b4c999474543a248ee42138 Mon Sep 17 00:00:00 2001 From: Matthijs van Henten Date: Wed, 6 Apr 2016 23:20:03 +0000 Subject: [PATCH 084/160] remove dependencies on architect plugins within profile --- plugins/c9.ide.errorhandler/simple_error_handler.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/c9.ide.errorhandler/simple_error_handler.js b/plugins/c9.ide.errorhandler/simple_error_handler.js index 36f530d1..ed4f6175 100644 --- a/plugins/c9.ide.errorhandler/simple_error_handler.js +++ b/plugins/c9.ide.errorhandler/simple_error_handler.js @@ -9,14 +9,13 @@ define(function(require, exports, module) { "use strict"; main.consumes = [ - "Plugin", "http" + "Plugin", ]; main.provides = ["error_handler"]; return main; function main(options, imports, register) { var Plugin = imports.Plugin; - var http = imports.http; /***** Initialization *****/ From c32f6815121f7a5d35d8941d58d2c238dd81c84d Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 7 Apr 2016 09:14:59 +0200 Subject: [PATCH 085/160] c9-auto-bump 3.1.2095 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 93b57859..5713491e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2094", + "version": "3.1.2095", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 3bdde35d1c5fe7d8bf2ea27d8079b0bfa2df3875 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 7 Apr 2016 09:46:01 +0200 Subject: [PATCH 086/160] c9-auto-bump 3.1.2096 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5713491e..6e0e446d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2095", + "version": "3.1.2096", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 0ff39094bcfba2a71f051353bfe2903e502fd7f4 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 7 Apr 2016 09:46:48 +0200 Subject: [PATCH 087/160] c9-auto-bump 3.1.2097 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6e0e446d..36fc1779 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2096", + "version": "3.1.2097", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 8d3f4a624a627076b534c78e24386c8dc005f072 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 7 Apr 2016 09:47:33 +0200 Subject: [PATCH 088/160] c9-auto-bump 3.1.2098 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 36fc1779..221b48a3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2097", + "version": "3.1.2098", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 76b9e3414f3728f0a6f8baea8a8192d674de2fbf Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 7 Apr 2016 09:52:45 +0200 Subject: [PATCH 089/160] c9-auto-bump 3.1.2099 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 221b48a3..e87464f0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2098", + "version": "3.1.2099", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 1dab887c0dfba9dcea5e97cbb4f7e27168446e89 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 7 Apr 2016 10:20:27 +0200 Subject: [PATCH 090/160] c9-auto-bump 3.1.2100 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e87464f0..f34ada7e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2099", + "version": "3.1.2100", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 375c381b72067dfe043d4fc7aeb7fc288ccc6323 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 7 Apr 2016 10:24:44 +0200 Subject: [PATCH 091/160] c9-auto-bump 3.1.2101 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f34ada7e..89281359 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2100", + "version": "3.1.2101", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 5afd9eece298c782882f917354004e955c8f577e Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 7 Apr 2016 10:48:51 +0200 Subject: [PATCH 092/160] c9-auto-bump 3.1.2102 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 89281359..cc84fb7f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2101", + "version": "3.1.2102", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From a0e7e7700d679570126adb05c13214d45d7a61a3 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 7 Apr 2016 11:50:11 +0200 Subject: [PATCH 093/160] c9-auto-bump 3.1.2103 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cc84fb7f..a7aa913a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2102", + "version": "3.1.2103", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From c5643a4aa319be7b6cec8b1d5e65a0079d6304dc Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 7 Apr 2016 11:55:34 +0200 Subject: [PATCH 094/160] c9-auto-bump 3.1.2104 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a7aa913a..3c8c3934 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2103", + "version": "3.1.2104", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 6ea8c9cca36faf483bf15c6b7a0ce504f0405954 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 7 Apr 2016 12:19:40 +0200 Subject: [PATCH 095/160] c9-auto-bump 3.1.2105 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3c8c3934..ef049d3b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2104", + "version": "3.1.2105", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From ec9590c93fdef60e7a18434d30174f53ffcaba93 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 7 Apr 2016 12:22:40 +0200 Subject: [PATCH 096/160] c9-auto-bump 3.1.2106 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ef049d3b..e40bfdcc 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2105", + "version": "3.1.2106", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From d2b4b7a2ec4fa92dde0c082af3f11f69ceae3f92 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 7 Apr 2016 12:26:24 +0200 Subject: [PATCH 097/160] c9-auto-bump 3.1.2107 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e40bfdcc..5e23044f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2106", + "version": "3.1.2107", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 99ae583f2223ee5e440b0e369b0f3a0d8f322cfd Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 7 Apr 2016 15:38:38 +0200 Subject: [PATCH 098/160] c9-auto-bump 3.1.2108 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5e23044f..8e95959c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2107", + "version": "3.1.2108", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 630df80c5abac24bc22cce0160253c824200278b Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 7 Apr 2016 15:41:32 +0200 Subject: [PATCH 099/160] c9-auto-bump 3.1.2109 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8e95959c..e1285bf5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2108", + "version": "3.1.2109", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From f136bdfb22cc7be0b82b405fc6f3856720079638 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 7 Apr 2016 15:55:44 +0200 Subject: [PATCH 100/160] c9-auto-bump 3.1.2110 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e1285bf5..0b497a03 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2109", + "version": "3.1.2110", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 8ab451845f0c1ccd23c6a5d0f145019f41de7347 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 7 Apr 2016 16:29:32 +0200 Subject: [PATCH 101/160] c9-auto-bump 3.1.2111 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0b497a03..3757288c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2110", + "version": "3.1.2111", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From bef8e416b7f7d5bd71978babf3d17261ff59810e Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Thu, 7 Apr 2016 14:48:44 +0000 Subject: [PATCH 102/160] add option to disable CPU throttling --- server.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server.js b/server.js index 3ac3c1bb..13f16846 100755 --- a/server.js +++ b/server.js @@ -168,6 +168,8 @@ function loadSettings(settingsName) { return settings; } +module.exports.loadSettings = loadSettings; + function start(configName, options, callback) { console.log("Starting", configName); From 88eb68e074bc3a669fb020bac690d9c91b4b3f8f Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 7 Apr 2016 16:55:53 +0200 Subject: [PATCH 103/160] c9-auto-bump 3.1.2112 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3757288c..b02f1537 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2111", + "version": "3.1.2112", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 16761d1318edc3bd3cb02a18eb0119abd5f16f57 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 7 Apr 2016 17:01:41 +0200 Subject: [PATCH 104/160] c9-auto-bump 3.1.2113 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b02f1537..8280a78c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2112", + "version": "3.1.2113", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From b727c78ed7dce97fb847db168291ff673de38702 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 7 Apr 2016 17:05:10 +0200 Subject: [PATCH 105/160] c9-auto-bump 3.1.2114 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8280a78c..2c3bfe13 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2113", + "version": "3.1.2114", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 2c5c274fa9a46dda45e36b465a6251ba2b727db9 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 7 Apr 2016 18:25:38 +0200 Subject: [PATCH 106/160] c9-auto-bump 3.1.2115 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2c3bfe13..1c525242 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2114", + "version": "3.1.2115", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From d7a3fe4c69755fd5441c64284c052823189cce4c Mon Sep 17 00:00:00 2001 From: nightwing Date: Thu, 7 Apr 2016 16:30:11 +0000 Subject: [PATCH 107/160] fix typescript mode --- node_modules/ace/lib/ace/mode/coldfusion_highlight_rules.js | 2 +- node_modules/ace/lib/ace/mode/html_highlight_rules.js | 2 +- node_modules/ace/lib/ace/mode/javascript_highlight_rules.js | 2 +- node_modules/ace/lib/ace/mode/typescript_highlight_rules.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/node_modules/ace/lib/ace/mode/coldfusion_highlight_rules.js b/node_modules/ace/lib/ace/mode/coldfusion_highlight_rules.js index 0004e8ee..295e0b1a 100644 --- a/node_modules/ace/lib/ace/mode/coldfusion_highlight_rules.js +++ b/node_modules/ace/lib/ace/mode/coldfusion_highlight_rules.js @@ -75,7 +75,7 @@ var ColdfusionHighlightRules = function() { this.$rules[s].unshift(cfTag); }, this); - this.embedTagRules(new JavaScriptHighlightRules({noJSX: true}).getRules(), "cfjs-", "cfscript"); + this.embedTagRules(new JavaScriptHighlightRules({jsx: false}).getRules(), "cfjs-", "cfscript"); this.normalizeRules(); }; diff --git a/node_modules/ace/lib/ace/mode/html_highlight_rules.js b/node_modules/ace/lib/ace/mode/html_highlight_rules.js index cbb558a6..de8661b1 100644 --- a/node_modules/ace/lib/ace/mode/html_highlight_rules.js +++ b/node_modules/ace/lib/ace/mode/html_highlight_rules.js @@ -99,7 +99,7 @@ var HtmlHighlightRules = function() { }); this.embedTagRules(CssHighlightRules, "css-", "style"); - this.embedTagRules(new JavaScriptHighlightRules({noJSX: true}).getRules(), "js-", "script"); + this.embedTagRules(new JavaScriptHighlightRules({jsx: false}).getRules(), "js-", "script"); if (this.constructor === HtmlHighlightRules) this.normalizeRules(); diff --git a/node_modules/ace/lib/ace/mode/javascript_highlight_rules.js b/node_modules/ace/lib/ace/mode/javascript_highlight_rules.js index 75151625..64de72d5 100644 --- a/node_modules/ace/lib/ace/mode/javascript_highlight_rules.js +++ b/node_modules/ace/lib/ace/mode/javascript_highlight_rules.js @@ -383,7 +383,7 @@ var JavaScriptHighlightRules = function(options) { }] }); - if (!options || !options.noJSX) + if (!options || options.jsx != false) JSX.call(this); } diff --git a/node_modules/ace/lib/ace/mode/typescript_highlight_rules.js b/node_modules/ace/lib/ace/mode/typescript_highlight_rules.js index fb68548b..82c9fb4e 100644 --- a/node_modules/ace/lib/ace/mode/typescript_highlight_rules.js +++ b/node_modules/ace/lib/ace/mode/typescript_highlight_rules.js @@ -86,7 +86,7 @@ var TypeScriptHighlightRules = function(options) { } ]; - var JSRules = new JavaScriptHighlightRules({jsx: options && options.jsx}).getRules(); + var JSRules = new JavaScriptHighlightRules({jsx: (options && options.jsx) == true}).getRules(); JSRules.start = tsRules.concat(JSRules.start); this.$rules = JSRules; From 53974c343e79c77edfaabc84a832c8294a5a4457 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 7 Apr 2016 18:44:27 +0200 Subject: [PATCH 108/160] c9-auto-bump 3.1.2116 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1c525242..f707198c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2115", + "version": "3.1.2116", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 0e5652121d16070f84982d96486ff3b487371d78 Mon Sep 17 00:00:00 2001 From: Tim Robinson Date: Thu, 7 Apr 2016 18:46:21 +0000 Subject: [PATCH 109/160] Fixing bug in areOperationsMirrored and adding tests for it --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d29b169d..7d13ea72 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "c9.ide.language.javascript.infer": "#325ac6880e", "c9.ide.language.jsonalyzer": "#4b329741b1", "c9.ide.language.codeintel": "#046d39603b", - "c9.ide.collab": "#c9048d629a", + "c9.ide.collab": "#23fab49d71", "c9.ide.local": "#10eb45842a", "c9.ide.find": "#e33fbaed2f", "c9.ide.find.infiles": "#c0a13737ef", From ee51e1f41084d4322f6df75c93278e40100f7151 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 7 Apr 2016 20:50:15 +0200 Subject: [PATCH 110/160] c9-auto-bump 3.1.2117 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f707198c..4be2fc03 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2116", + "version": "3.1.2117", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From de3baca731e55a8d49e6478e659d8f9937e1e715 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 7 Apr 2016 21:14:32 +0200 Subject: [PATCH 111/160] c9-auto-bump 3.1.2118 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4be2fc03..e17f0d18 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2117", + "version": "3.1.2118", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From e3e24b07614267399ca359890f04ed8499bfeefe Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 7 Apr 2016 22:08:10 +0200 Subject: [PATCH 112/160] c9-auto-bump 3.1.2119 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 89f5a75b..e29f1c14 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2118", + "version": "3.1.2119", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From bcb59bb0403598537cd17fecf7ae9bef23ef1b1e Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 7 Apr 2016 22:26:20 +0200 Subject: [PATCH 113/160] c9-auto-bump 3.1.2120 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e29f1c14..25abbfc5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2119", + "version": "3.1.2120", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 866bc7ee0f364894956abd02ae6009ccdbd340f2 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 8 Apr 2016 09:05:11 +0200 Subject: [PATCH 114/160] c9-auto-bump 3.1.2121 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 25abbfc5..55948759 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2120", + "version": "3.1.2121", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From fdba53b60c537fb60b26ce8f0cd8c2d2e7bad5ea Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 8 Apr 2016 09:59:40 +0200 Subject: [PATCH 115/160] c9-auto-bump 3.1.2122 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 55948759..ffe5aa6f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2121", + "version": "3.1.2122", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 335ed39409eddf258d3163f0fdfa227e120f48b3 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 8 Apr 2016 10:17:34 +0200 Subject: [PATCH 116/160] c9-auto-bump 3.1.2123 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ffe5aa6f..0452cdaa 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2122", + "version": "3.1.2123", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From f6a958d1a782c132d652e3ea8697a14b52419c85 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 8 Apr 2016 10:22:43 +0200 Subject: [PATCH 117/160] c9-auto-bump 3.1.2124 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0452cdaa..c63abaee 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2123", + "version": "3.1.2124", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 33d2f8caf5c4ab634ca2981d401fb0843e28f51d Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 8 Apr 2016 10:37:41 +0200 Subject: [PATCH 118/160] c9-auto-bump 3.1.2125 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c63abaee..cbece2f7 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2124", + "version": "3.1.2125", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From ca343123d671974e0bc8b8dee186de2c67b4c6b6 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 8 Apr 2016 11:00:56 +0200 Subject: [PATCH 119/160] c9-auto-bump 3.1.2126 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cbece2f7..08a25370 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2125", + "version": "3.1.2126", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 2cb4c9078c01a828102ead8f66791625a8adb182 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 8 Apr 2016 11:24:52 +0200 Subject: [PATCH 120/160] c9-auto-bump 3.1.2127 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 08a25370..c73366f8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2126", + "version": "3.1.2127", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 4ab5dc3f90dc5f85ae944ddbc868784cf85c3753 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 8 Apr 2016 11:59:30 +0200 Subject: [PATCH 121/160] c9-auto-bump 3.1.2128 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c73366f8..ea57491d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2127", + "version": "3.1.2128", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 65dbd00865202c378cd52e87e93e99c9be79fb7b Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 8 Apr 2016 12:24:50 +0200 Subject: [PATCH 122/160] c9-auto-bump 3.1.2129 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ea57491d..01552ccf 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2128", + "version": "3.1.2129", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 7a98330b666017c34cf8e6030f827c2dfc2e1c06 Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Fri, 8 Apr 2016 10:30:50 +0000 Subject: [PATCH 123/160] fix docker build --- server.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server.js b/server.js index 3ac3c1bb..117a4797 100755 --- a/server.js +++ b/server.js @@ -8,8 +8,6 @@ try { var path = require("path"); var architect = require("architect"); -var optimist = require("optimist"); -var async = require("async"); var os = require("os"); var urls = require("c9/urls"); var hostname = require("c9/hostname"); @@ -73,7 +71,9 @@ module.exports.getDefaultSettings = getDefaultSettings; function main(argv, config, onLoaded) { var inContainer = os.hostname().match(/-\d+$/); - + var optimist = require("optimist"); + var async = require("async"); + var options = optimist(argv) .usage("Usage: $0 [CONFIG_NAME] [--help]") .alias("s", "settings") From 66a16fd31217918849e5967ff2a0f1b2509a0c8d Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 8 Apr 2016 12:54:31 +0200 Subject: [PATCH 124/160] c9-auto-bump 3.1.2130 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 01552ccf..8de937b3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2129", + "version": "3.1.2130", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From ec8806fc24ea7167cd3bbffe3dbe3a47021edefd Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 8 Apr 2016 13:50:33 +0200 Subject: [PATCH 125/160] c9-auto-bump 3.1.2131 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8de937b3..19920824 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2130", + "version": "3.1.2131", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 5d394e17e47aa4da2bd74e5b16d5f60988451310 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 8 Apr 2016 14:58:43 +0200 Subject: [PATCH 126/160] c9-auto-bump 3.1.2132 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 19920824..789ecd41 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2131", + "version": "3.1.2132", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 8dc098c39f6f14ec127cd68b4b62058bc34acfe4 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 8 Apr 2016 15:16:54 +0200 Subject: [PATCH 127/160] c9-auto-bump 3.1.2133 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 789ecd41..063da673 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2132", + "version": "3.1.2133", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From ee854d1ae706da4574d7ae0f2fb67a2aad985ab3 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 8 Apr 2016 15:18:25 +0200 Subject: [PATCH 128/160] c9-auto-bump 3.1.2134 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 063da673..2a8bdb72 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2133", + "version": "3.1.2134", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 5279f3e61a0ee986df99b73ad3d2f4a6e9a698cf Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 8 Apr 2016 15:19:09 +0200 Subject: [PATCH 129/160] c9-auto-bump 3.1.2135 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2a8bdb72..192e822c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2134", + "version": "3.1.2135", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From d01f866bbae492da32e213443b2e66195bfa6bb0 Mon Sep 17 00:00:00 2001 From: c9bot Date: Sat, 9 Apr 2016 21:10:07 +0200 Subject: [PATCH 130/160] c9-auto-bump 3.1.2136 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 192e822c..6c2c1d87 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2135", + "version": "3.1.2136", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From c0048ae44c3ae66f53a051045098c319355b66bc Mon Sep 17 00:00:00 2001 From: c9bot Date: Sun, 10 Apr 2016 22:04:44 +0200 Subject: [PATCH 131/160] c9-auto-bump 3.1.2137 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6c2c1d87..42470ae5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2136", + "version": "3.1.2137", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From b6bf584e14690634a73fb8287c6be73f5ccfeef5 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 11 Apr 2016 09:27:42 +0200 Subject: [PATCH 132/160] c9-auto-bump 3.1.2138 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 42470ae5..b832aa44 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2137", + "version": "3.1.2138", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From aaab995dc23a10fbd8d805f0899a0aaffe8b1474 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 11 Apr 2016 09:29:58 +0200 Subject: [PATCH 133/160] c9-auto-bump 3.1.2139 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b832aa44..f40d2a01 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2138", + "version": "3.1.2139", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 709144bd277b485c3328c90b7fd7bffa37cd1fe2 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 11 Apr 2016 10:36:53 +0200 Subject: [PATCH 134/160] c9-auto-bump 3.1.2140 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f40d2a01..33817e71 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2139", + "version": "3.1.2140", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 1fc4db9e84c3b193c7a4187c0b823920d79219ef Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 11 Apr 2016 10:58:48 +0200 Subject: [PATCH 135/160] c9-auto-bump 3.1.2141 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 33817e71..536c6914 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2140", + "version": "3.1.2141", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From d720d7365a86c310f8aea8e34ff422de77fe99c4 Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Mon, 11 Apr 2016 09:08:51 +0000 Subject: [PATCH 136/160] sanitize path from URL --- plugins/c9.vfs.standalone/standalone.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/c9.vfs.standalone/standalone.js b/plugins/c9.vfs.standalone/standalone.js index ea70fea4..8270e02e 100644 --- a/plugins/c9.vfs.standalone/standalone.js +++ b/plugins/c9.vfs.standalone/standalone.js @@ -176,7 +176,7 @@ function plugin(options, imports, register) { api.get("/update/:path*", function(req, res, next) { var filename = req.params.path; - var path = resolve(__dirname + "/../../build/output/" + filename); + var path = resolve(__dirname + "/../../build/output/" + resolve("/" + filename)); var stream = fs.createReadStream(path); stream.on("error", function(err) { From f61148461c5838fca152028c0ff3e8928342b508 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 11 Apr 2016 11:59:40 +0200 Subject: [PATCH 137/160] c9-auto-bump 3.1.2142 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 536c6914..562d07a8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2141", + "version": "3.1.2142", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 333b5084f94c6aeed09490d28055108d55ffbd18 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 11 Apr 2016 12:03:47 +0200 Subject: [PATCH 138/160] c9-auto-bump 3.1.2143 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 562d07a8..663fa22b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2142", + "version": "3.1.2143", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 8c2bf4bab4f82fe795316b2a870cd1023f7c4226 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 11 Apr 2016 13:57:36 +0200 Subject: [PATCH 139/160] c9-auto-bump 3.1.2144 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 663fa22b..739c7636 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2143", + "version": "3.1.2144", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 0b16e5b6693d5ecd36cc094f0f650d558b33a6c3 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 11 Apr 2016 13:58:09 +0200 Subject: [PATCH 140/160] c9-auto-bump 3.1.2145 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 739c7636..3c1d61b0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2144", + "version": "3.1.2145", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From c4265337a818a53c8419f342f1aec8ab71e8ce24 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 11 Apr 2016 14:04:12 +0200 Subject: [PATCH 141/160] c9-auto-bump 3.1.2146 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3c1d61b0..d9b58996 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2145", + "version": "3.1.2146", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 7a0e9092ec0a2faff13a738a159623a2ae99bb4d Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 11 Apr 2016 14:09:54 +0200 Subject: [PATCH 142/160] c9-auto-bump 3.1.2147 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d9b58996..3f298ff3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2146", + "version": "3.1.2147", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 2375d046228601f8a5a855e68adff0324def16dd Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 11 Apr 2016 14:58:11 +0200 Subject: [PATCH 143/160] c9-auto-bump 3.1.2148 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3f298ff3..7333ff28 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2147", + "version": "3.1.2148", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From f143d1f7da01f6b5e62c930cb95d9efc3aff5f35 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 11 Apr 2016 15:32:27 +0200 Subject: [PATCH 144/160] c9-auto-bump 3.1.2149 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7333ff28..ad819c0c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2148", + "version": "3.1.2149", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 0cf83d75a0ee3e9b81c1602e30a72fd220f4da04 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 11 Apr 2016 15:41:13 +0200 Subject: [PATCH 145/160] c9-auto-bump 3.1.2150 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ad819c0c..fc9dfb48 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2149", + "version": "3.1.2150", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 46462602e818ddeb7a89feff6b70a5ff90c86a7d Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 11 Apr 2016 15:50:27 +0200 Subject: [PATCH 146/160] c9-auto-bump 3.1.2151 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fc9dfb48..f6e1207e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2150", + "version": "3.1.2151", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From fe3d47702d779c330cb96902a9fbb175327725bd Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 11 Apr 2016 15:55:59 +0200 Subject: [PATCH 147/160] c9-auto-bump 3.1.2152 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f6e1207e..b0bcae24 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2151", + "version": "3.1.2152", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From ca9d67c2abc3b42ad4700a29ad3d3366f074c55b Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 11 Apr 2016 16:20:13 +0200 Subject: [PATCH 148/160] c9-auto-bump 3.1.2153 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b0bcae24..022f251d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2152", + "version": "3.1.2153", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 8d4b963ca384aaebd216a1e1b3f8d2ebc35537b0 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 11 Apr 2016 16:27:51 +0200 Subject: [PATCH 149/160] c9-auto-bump 3.1.2154 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 022f251d..b71434a2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2153", + "version": "3.1.2154", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 59990a4ae28f3fda252f4e9743a7d917ad4e0124 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 11 Apr 2016 16:48:24 +0200 Subject: [PATCH 150/160] c9-auto-bump 3.1.2155 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b71434a2..8deccfcd 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2154", + "version": "3.1.2155", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 403b50106aaaab0dc795e84c97960e6fe499d57a Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 11 Apr 2016 16:53:54 +0200 Subject: [PATCH 151/160] c9-auto-bump 3.1.2156 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8deccfcd..279b3964 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2155", + "version": "3.1.2156", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 76bd58b20a2c711881416b298502518d88255172 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 11 Apr 2016 17:05:30 +0200 Subject: [PATCH 152/160] c9-auto-bump 3.1.2157 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 279b3964..813c7d4b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2156", + "version": "3.1.2157", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From f1d232d27df8352e3e4747e0d6fdcfa2ac6ca70c Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 11 Apr 2016 17:15:24 +0200 Subject: [PATCH 153/160] c9-auto-bump 3.1.2158 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 813c7d4b..d129667a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2157", + "version": "3.1.2158", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From eddfbcc76a154c9621379329689d3997bb6215b1 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 11 Apr 2016 17:40:31 +0200 Subject: [PATCH 154/160] c9-auto-bump 3.1.2159 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d129667a..c1b5584c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2158", + "version": "3.1.2159", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 24c9eb4d28e10959c715e64a801c5aa7f78cdb08 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 11 Apr 2016 17:40:49 +0200 Subject: [PATCH 155/160] c9-auto-bump 3.1.2160 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c1b5584c..b0b31703 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2159", + "version": "3.1.2160", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 5e35d394e9d8f90c1df0cbcac1cf8a0f77cca363 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 11 Apr 2016 17:41:41 +0200 Subject: [PATCH 156/160] c9-auto-bump 3.1.2161 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b0b31703..f90e68d8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2160", + "version": "3.1.2161", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From eb9c9054ea47a88134e9695c3073ae80766e1d36 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 12 Apr 2016 05:22:49 +0200 Subject: [PATCH 157/160] c9-auto-bump 3.1.2162 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f90e68d8..4547474b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2161", + "version": "3.1.2162", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From d404d1ded9a7c825aff65f417006533646e563d3 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 12 Apr 2016 10:12:19 +0200 Subject: [PATCH 158/160] c9-auto-bump 3.1.2163 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4547474b..2f5b2ec0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2162", + "version": "3.1.2163", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From b115ca5554d969b2c8289dc6b37976f5edc2e165 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 12 Apr 2016 12:00:50 +0200 Subject: [PATCH 159/160] c9-auto-bump 3.1.2164 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2f5b2ec0..ead416be 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2163", + "version": "3.1.2164", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From cc43014c5e8bcf2fc53145351e468c5f46e8b093 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 12 Apr 2016 12:16:00 +0200 Subject: [PATCH 160/160] c9-auto-bump 3.1.2165 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ead416be..bff15b17 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2164", + "version": "3.1.2165", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9",