From f15df7e58aace8c545d0c631b64a2c3f95be831b Mon Sep 17 00:00:00 2001 From: nightwing Date: Wed, 16 Sep 2015 17:48:26 +0400 Subject: [PATCH 01/49] fix diff for added/removed files --- node_modules/ace/lib/ace/lib/lang.js | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/node_modules/ace/lib/ace/lib/lang.js b/node_modules/ace/lib/ace/lib/lang.js index 921dee1d..f306e3e4 100644 --- a/node_modules/ace/lib/ace/lib/lang.js +++ b/node_modules/ace/lib/ace/lib/lang.js @@ -136,7 +136,7 @@ exports.escapeRegExp = function(str) { }; exports.escapeHTML = function(str) { - return str.replace(/&/g, "&").replace(/"/g, """).replace(/'/g, "'").replace(/ Date: Thu, 24 Sep 2015 02:40:12 +0200 Subject: [PATCH 02/49] c9-auto-bump 3.0.2775 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f7a6806f..8cce8081 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.0.2774", + "version": "3.0.2775", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 00afe6e71d42b6d3ea6af2d0864368db14333918 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 24 Sep 2015 09:51:25 +0200 Subject: [PATCH 03/49] c9-auto-bump 3.0.2776 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8cce8081..ee4f7dfe 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.0.2775", + "version": "3.0.2776", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 90729e8c03144e5a82d96507cc05a4c93c43db55 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 24 Sep 2015 10:38:15 +0200 Subject: [PATCH 04/49] c9-auto-bump 3.0.2777 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ee4f7dfe..fefd9626 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.0.2776", + "version": "3.0.2777", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From bbb4927d89680da065b5f963d294ae545495c20d Mon Sep 17 00:00:00 2001 From: Tim Robinson Date: Thu, 24 Sep 2015 09:10:17 +0000 Subject: [PATCH 05/49] Better logging of error dialogs so we can find them in raygun --- plugins/c9.ide.dialog.common/error.js | 32 +++++++++++++++------------ 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/plugins/c9.ide.dialog.common/error.js b/plugins/c9.ide.dialog.common/error.js index 7e25383e..730e4c15 100644 --- a/plugins/c9.ide.dialog.common/error.js +++ b/plugins/c9.ide.dialog.common/error.js @@ -84,6 +84,22 @@ define(function(require, exports, module) { return b1.left + b1.width + ((b2.left - b1.left - b1.width)/2); } + + function getMessageString(message) { + var messageString; + if (typeof message == "string") { + messageString = apf.escapeXML(message); + } + else { + if (message.message) + messageString = apf.escapeXML(message.message); + else if (message.html) + messageString = message.html; + else + messageString = "Error: " + message.toString(); + } + return messageString + } function show(message, timeout) { // Error message container @@ -105,23 +121,11 @@ define(function(require, exports, module) { return console.error("empty error message", message); } - console.error("Error:", - message.stack || message.html || message.message || message); + console.error("Error dialog shown: ", getMessageString(message)); } hide(function() { - var messageString; - if (typeof message == "string") { - messageString = apf.escapeXML(message); - } - else { - if (message.message) - messageString = apf.escapeXML(message.message); - else if (message.html) - messageString = message.html; - else - messageString = "Error: " + message.toString(); - } + var messageString = getMessageString(message); error.innerHTML = "
" + messageString + "
"; From 0f426637fc4d2ed6759d83125e0f544be0a686db Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 24 Sep 2015 12:02:10 +0200 Subject: [PATCH 06/49] c9-auto-bump 3.0.2778 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fefd9626..6b4d0a1d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.0.2777", + "version": "3.0.2778", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 2ede69786f8513a5e94b0f98a557205b90608096 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 24 Sep 2015 12:06:55 +0200 Subject: [PATCH 07/49] c9-auto-bump 3.0.2779 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6b4d0a1d..96617530 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.0.2778", + "version": "3.0.2779", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 732d504f00a1305b63b8b7f6ec17f36fca4e14ab Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 24 Sep 2015 13:06:41 +0200 Subject: [PATCH 08/49] c9-auto-bump 3.0.2780 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 96617530..134e64ce 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.0.2779", + "version": "3.0.2780", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 330d1b8ea470a7dc11aa99d64024036dbe0330ee Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 24 Sep 2015 14:28:12 +0200 Subject: [PATCH 09/49] c9-auto-bump 3.0.2781 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 134e64ce..34761805 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.0.2780", + "version": "3.0.2781", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From f53ca168938776d5a0ee1b8cf436ebdce7cf6cd6 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 24 Sep 2015 15:55:13 +0200 Subject: [PATCH 10/49] c9-auto-bump 3.0.2782 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 34761805..17d4a227 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.0.2781", + "version": "3.0.2782", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From e8cfd478928cd56904e13871839dd9bbd171b69c Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 24 Sep 2015 17:00:26 +0200 Subject: [PATCH 11/49] c9-auto-bump 3.0.2783 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 17d4a227..36c5f44c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.0.2782", + "version": "3.0.2783", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From f2d139f24636226deb771aaa18e3e23fc192a593 Mon Sep 17 00:00:00 2001 From: Tim Robinson Date: Thu, 24 Sep 2015 15:28:51 +0000 Subject: [PATCH 12/49] Replace spaces with underscores in mount paths --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 34761805..f51a4c65 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,7 @@ "c9.ide.imgeditor": "#66a9733dc1", "c9.ide.immediate": "#18c23aa730", "c9.ide.installer": "#0fde9f0067", - "c9.ide.mount": "#da6ad73c5b", + "c9.ide.mount": "#79aff3782c", "c9.ide.navigate": "#c191d9b92f", "c9.ide.newresource": "#981a408a7b", "c9.ide.openfiles": "#7fa4a97fed", From 59667b5d0ff32d9eb07fe11a7a8fa46b2d036e36 Mon Sep 17 00:00:00 2001 From: Tim Robinson Date: Thu, 24 Sep 2015 15:30:53 +0000 Subject: [PATCH 13/49] Replace all the spaces --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f51a4c65..05fbe448 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,7 @@ "c9.ide.imgeditor": "#66a9733dc1", "c9.ide.immediate": "#18c23aa730", "c9.ide.installer": "#0fde9f0067", - "c9.ide.mount": "#79aff3782c", + "c9.ide.mount": "#83ca2db6fc", "c9.ide.navigate": "#c191d9b92f", "c9.ide.newresource": "#981a408a7b", "c9.ide.openfiles": "#7fa4a97fed", From a691656ff930bd53de15f52cf971b54be51d2f88 Mon Sep 17 00:00:00 2001 From: Tim Robinson Date: Thu, 24 Sep 2015 15:38:58 +0000 Subject: [PATCH 14/49] Remove all special characters from the path --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 05fbe448..6d8edab6 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,7 @@ "c9.ide.imgeditor": "#66a9733dc1", "c9.ide.immediate": "#18c23aa730", "c9.ide.installer": "#0fde9f0067", - "c9.ide.mount": "#83ca2db6fc", + "c9.ide.mount": "#f15e26a71d", "c9.ide.navigate": "#c191d9b92f", "c9.ide.newresource": "#981a408a7b", "c9.ide.openfiles": "#7fa4a97fed", From 6efe3c8f45c09bee6e5f17b1d5741574ab0d16e6 Mon Sep 17 00:00:00 2001 From: Tim Robinson Date: Thu, 24 Sep 2015 15:39:55 +0000 Subject: [PATCH 15/49] actually use the function --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6d8edab6..9f320d0a 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,7 @@ "c9.ide.imgeditor": "#66a9733dc1", "c9.ide.immediate": "#18c23aa730", "c9.ide.installer": "#0fde9f0067", - "c9.ide.mount": "#f15e26a71d", + "c9.ide.mount": "#dccfb51a2b", "c9.ide.navigate": "#c191d9b92f", "c9.ide.newresource": "#981a408a7b", "c9.ide.openfiles": "#7fa4a97fed", From e5cd2eb64c5b3b9f34f8cbfb13586eb0648cf8c9 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 24 Sep 2015 18:29:58 +0200 Subject: [PATCH 16/49] c9-auto-bump 3.0.2784 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 36c5f44c..3112e012 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.0.2783", + "version": "3.0.2784", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 0ad3ff9c7f1aaef4c687ad17afcb4a336b26f4e0 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 25 Sep 2015 10:16:31 +0200 Subject: [PATCH 17/49] c9-auto-bump 3.0.2785 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3112e012..bd8a8d9f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.0.2784", + "version": "3.0.2785", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From e7f41a8819d1d872a40221097491f38864ce891a Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 25 Sep 2015 11:27:58 +0200 Subject: [PATCH 18/49] c9-auto-bump 3.0.2786 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bd8a8d9f..0e1541e6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.0.2785", + "version": "3.0.2786", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 18969df80d86058cb9a355d13e89fb709821f832 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 25 Sep 2015 12:34:14 +0200 Subject: [PATCH 19/49] c9-auto-bump 3.0.2787 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0e1541e6..ef30ac7c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.0.2786", + "version": "3.0.2787", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 58e1029972e6f60b577e05e81c869a741f736f26 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 25 Sep 2015 13:42:25 +0200 Subject: [PATCH 20/49] c9-auto-bump 3.0.2788 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ef30ac7c..5e5feed8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.0.2787", + "version": "3.0.2788", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 0db3a1d45c46589124d1023bcc1b325ccd533eb5 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 25 Sep 2015 15:18:42 +0200 Subject: [PATCH 21/49] c9-auto-bump 3.0.2789 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index aba69b66..7f42ddd0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.0.2788", + "version": "3.0.2789", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From be8c80b51180c3d510b7865cd7c950a86c50298c Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 25 Sep 2015 15:18:58 +0200 Subject: [PATCH 22/49] c9-auto-bump 3.0.2790 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7f42ddd0..6c579c35 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.0.2789", + "version": "3.0.2790", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 66f7ead2edee77b7d18af322d7f4f794df19cf59 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 25 Sep 2015 15:28:37 +0200 Subject: [PATCH 23/49] c9-auto-bump 3.0.2791 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6c579c35..701af394 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.0.2790", + "version": "3.0.2791", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 52297a54472c52a2f9202737d22546f6d4d4a4bc Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 25 Sep 2015 16:03:27 +0200 Subject: [PATCH 24/49] c9-auto-bump 3.0.2792 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 701af394..530bbc3a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.0.2791", + "version": "3.0.2792", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From a82c0ab4f2e6a6ab4005ea9b4b62a9ca56ed5817 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 25 Sep 2015 17:28:32 +0200 Subject: [PATCH 25/49] c9-auto-bump 3.0.2793 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 530bbc3a..5661e2ff 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.0.2792", + "version": "3.0.2793", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 9065976937635509d1bb6f57f62c08043364a114 Mon Sep 17 00:00:00 2001 From: c9bot Date: Sun, 27 Sep 2015 01:28:26 +0200 Subject: [PATCH 26/49] c9-auto-bump 3.0.2794 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5661e2ff..4c475b19 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.0.2793", + "version": "3.0.2794", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 60dbfc9636c6ef02aefd5b105b3645c1222dffa5 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Mon, 28 Sep 2015 09:11:17 +0200 Subject: [PATCH 27/49] Disable test that is flaky on CI --- plugins/c9.ide.terminal/predict_echo_test.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/c9.ide.terminal/predict_echo_test.js b/plugins/c9.ide.terminal/predict_echo_test.js index ac225ed9..335d84f7 100644 --- a/plugins/c9.ide.terminal/predict_echo_test.js +++ b/plugins/c9.ide.terminal/predict_echo_test.js @@ -299,7 +299,8 @@ require(["lib/architect/architect", "lib/chai/chai", "/vfs-root", "ace/test/asse sendAll(["e", "h"]); }); - it("supports delete with repeated characters; stress test", function loop(done, attempt) { + // Fails on CI server (https://github.com/c9/newclient/issues/9550) + it.skip("supports delete with repeated characters; stress test", function loop(done, attempt) { this.timeout && this.timeout(60000); session.$predictor.state = 0; if (attempt === 5) From e695b98e997995d0c065433ba633669d6ddbec90 Mon Sep 17 00:00:00 2001 From: nightwing Date: Mon, 28 Sep 2015 12:44:46 +0400 Subject: [PATCH 28/49] refactor client-config_test --- configs/client-default-local.js | 15 +-------------- configs/client-default.js | 3 +-- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/configs/client-default-local.js b/configs/client-default-local.js index b2ed60a1..33361ca7 100644 --- a/configs/client-default-local.js +++ b/configs/client-default-local.js @@ -1,6 +1,7 @@ var join = require("path").join; module.exports = function(options) { + options.collab = false; var config = require("./client-default")(options); return module.exports.makeLocal(config, options); }; @@ -132,20 +133,6 @@ module.exports.makeLocal = function(config, options) { "plugins/c9.ide.newresource/open": true, "plugins/c9.ide.info/info": true, // "plugins/c9.ide.login/login": true, - "plugins/c9.ide.collab/connect": true, - "plugins/c9.ide.collab/collab": true, - "plugins/c9.ide.collab/collabpanel": true, - "plugins/c9.ide.collab/workspace": true, - "plugins/c9.ide.collab/util": true, - "plugins/c9.ide.collab/ot/document": true, - "plugins/c9.ide.collab/cursor_layer": true, - "plugins/c9.ide.collab/author_layer": true, - "plugins/c9.ide.collab/timeslider/timeslider": true, - "plugins/c9.ide.notifications/notifications": true, - "plugins/c9.ide.collab/members/members_panel": true, - "plugins/c9.ide.collab/share/share": true, - "plugins/c9.ide.collab/members/members": true, - "plugins/c9.ide.collab/chat/chat": true, "plugins/c9.ide.feedback/nps": true, "plugins/c9.ide.download/download": true }; diff --git a/configs/client-default.js b/configs/client-default.js index 5e87fe8b..19443ec5 100644 --- a/configs/client-default.js +++ b/configs/client-default.js @@ -218,7 +218,6 @@ module.exports = function(options) { nak: options.nakBin || "~/.c9/node_modules/nak/bin/nak", node: options.nodeBin, local: options.local, - installPath: options.installPath }, { packagePath: "plugins/c9.ide.find.infiles/findinfiles", @@ -277,7 +276,7 @@ module.exports = function(options) { // VFS "plugins/c9.fs/proc", - "plugins/c9.fs/proc.apigen", + "plugins/c9.fs/proc.apigen", // used only by disabled deploy plugins "plugins/c9.fs/net", { packagePath: "plugins/c9.fs/fs", From 8329afd6be87043e50d188c5ec9af6a887203b92 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 28 Sep 2015 12:21:04 +0200 Subject: [PATCH 29/49] c9-auto-bump 3.0.2795 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4c475b19..70d6744b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.0.2794", + "version": "3.0.2795", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 06153b248f7cf9f5b453f2d02bc35d4195bb4297 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 28 Sep 2015 12:48:05 +0200 Subject: [PATCH 30/49] c9-auto-bump 3.0.2796 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 70d6744b..c2b2c3b8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.0.2795", + "version": "3.0.2796", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From c38a73ee420eecb72be34591f25c2e1e94562c8f Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 28 Sep 2015 12:48:35 +0200 Subject: [PATCH 31/49] c9-auto-bump 3.0.2797 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c2b2c3b8..28d4c10a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.0.2796", + "version": "3.0.2797", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From a92877ff8b78aeb31877e174679b87bc14c64c54 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 28 Sep 2015 12:50:31 +0200 Subject: [PATCH 32/49] c9-auto-bump 3.0.2798 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 28d4c10a..e0824780 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.0.2797", + "version": "3.0.2798", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From f4d53a146dfe4f4d3d150a2288188b0abd879986 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 28 Sep 2015 13:07:59 +0200 Subject: [PATCH 33/49] c9-auto-bump 3.0.2799 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e0824780..31789994 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.0.2798", + "version": "3.0.2799", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 3ba6fd02a23ed67111422aa426aebb954038e8cf Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 28 Sep 2015 14:28:16 +0200 Subject: [PATCH 34/49] c9-auto-bump 3.0.2800 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 31789994..8a8fcd1e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.0.2799", + "version": "3.0.2800", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 2e1b33cb33e76c4778bbb332bc14b768357d4814 Mon Sep 17 00:00:00 2001 From: nightwing Date: Mon, 28 Sep 2015 13:54:59 +0400 Subject: [PATCH 35/49] update ace --- node_modules/ace/ChangeLog.txt | 15 ++ node_modules/ace/Makefile.dryice.js | 14 +- node_modules/ace/demo/autoresize.html | 12 +- .../ace/demo/kitchen-sink/dev_util.js | 2 +- .../ace/demo/kitchen-sink/docs/c_cpp.cpp | 4 +- .../demo/kitchen-sink/docs/gherkin.feature | 4 +- .../ace/demo/kitchen-sink/docs/maze.mz | 23 ++ .../kitchen-sink/docs/sqlserver.sqlserver | 23 +- .../ace/demo/kitchen-sink/docs/swift.swift | 16 ++ node_modules/ace/demo/kitchen-sink/styles.css | 2 + .../ace/demo/static-highlighter/server.js | 17 +- node_modules/ace/demo/svg.svg | 11 + node_modules/ace/demo/xml.xml | 33 +++ .../ace/experiments/debug_mem_leak.html | 59 ++++++ node_modules/ace/lib/ace/autocomplete.js | 5 +- node_modules/ace/lib/ace/ext/modelist.js | 1 + node_modules/ace/lib/ace/lib/dom.js | 5 +- node_modules/ace/lib/ace/lib/event.js | 42 +++- node_modules/ace/lib/ace/lib/keys.js | 2 +- .../ace/mode/_test/highlight_rules_test.js | 45 ++-- .../lib/ace/mode/_test/text_coldfusion.txt | 8 + .../lib/ace/mode/_test/text_javascript.txt | 8 + .../ace/lib/ace/mode/_test/tokens_c_cpp.json | 9 +- .../ace/lib/ace/mode/_test/tokens_coffee.json | 4 +- .../lib/ace/mode/_test/tokens_coldfusion.json | 43 +++- .../lib/ace/mode/_test/tokens_javascript.json | 66 ++++++ .../lib/ace/mode/_test/tokens_markdown.json | 4 +- .../ace/lib/ace/mode/_test/tokens_rust.json | 2 +- .../ace/lib/ace/mode/_test/tokens_scala.json | 14 +- .../ace/mode/_test/tokens_soy_template.json | 12 +- .../lib/ace/mode/coffee_highlight_rules.js | 2 +- .../ace/mode/coldfusion_highlight_rules.js | 39 +++- node_modules/ace/lib/ace/mode/elm.js | 2 +- .../ace/lib/ace/mode/elm_highlight_rules.js | 3 + node_modules/ace/lib/ace/mode/erlang.js | 2 +- node_modules/ace/lib/ace/mode/forth.js | 2 +- .../lib/ace/mode/gherkin_highlight_rules.js | 30 ++- node_modules/ace/lib/ace/mode/golang.js | 1 + node_modules/ace/lib/ace/mode/haskell.js | 2 +- .../ace/lib/ace/mode/html_highlight_rules.js | 2 +- node_modules/ace/lib/ace/mode/ini.js | 2 +- .../ace/lib/ace/mode/jade_highlight_rules.js | 2 +- .../ace/mode/javascript_highlight_rules.js | 158 ++++++++++++-- .../ace/lib/ace/mode/jsp_highlight_rules.js | 2 +- .../ace/lib/ace/mode/lsl_highlight_rules.js | 7 +- .../lib/ace/mode/markdown_highlight_rules.js | 1 + node_modules/ace/lib/ace/mode/maze.js | 52 +++++ .../ace/lib/ace/mode/maze_highlight_rules.js | 154 ++++++++++++++ node_modules/ace/lib/ace/mode/mushcode.js | 1 - .../ace/lib/ace/mode/mysql_highlight_rules.js | 2 +- node_modules/ace/lib/ace/mode/perl.js | 4 +- .../ace/lib/ace/mode/php_highlight_rules.js | 8 +- node_modules/ace/lib/ace/mode/rust.js | 2 +- .../ace/lib/ace/mode/rust_highlight_rules.js | 58 +++--- .../ace/lib/ace/mode/scala_highlight_rules.js | 17 +- node_modules/ace/lib/ace/mode/soy_template.js | 8 - .../ace/mode/soy_template_highlight_rules.js | 3 +- .../ace/lib/ace/mode/sql_highlight_rules.js | 2 +- node_modules/ace/lib/ace/mode/swift.js | 60 ++++++ .../ace/lib/ace/mode/swift_highlight_rules.js | 196 ++++++++++++++++++ .../ace/lib/ace/mode/text_highlight_rules.js | 7 +- .../lib/ace/mode/verilog_highlight_rules.js | 8 + node_modules/ace/lib/ace/test/all_browser.js | 1 + node_modules/ace/package.json | 4 +- node_modules/ace/static.js | 18 +- node_modules/ace/tool/add_mode.js | 13 +- node_modules/ace/tool/lib.js | 110 +++++++++- node_modules/ace/tool/mode_creator.js | 4 +- node_modules/ace/tool/package.json | 19 +- node_modules/ace/tool/release.sh | 2 + node_modules/ace/tool/tmlanguage.js | 4 +- node_modules/ace/tool/update_deps.js | 149 ++++++------- 72 files changed, 1391 insertions(+), 277 deletions(-) create mode 100644 node_modules/ace/demo/kitchen-sink/docs/maze.mz create mode 100644 node_modules/ace/demo/kitchen-sink/docs/swift.swift create mode 100644 node_modules/ace/demo/svg.svg create mode 100644 node_modules/ace/demo/xml.xml create mode 100644 node_modules/ace/experiments/debug_mem_leak.html create mode 100644 node_modules/ace/lib/ace/mode/_test/text_coldfusion.txt create mode 100644 node_modules/ace/lib/ace/mode/maze.js create mode 100644 node_modules/ace/lib/ace/mode/maze_highlight_rules.js create mode 100644 node_modules/ace/lib/ace/mode/swift.js create mode 100644 node_modules/ace/lib/ace/mode/swift_highlight_rules.js diff --git a/node_modules/ace/ChangeLog.txt b/node_modules/ace/ChangeLog.txt index e9c41e4c..58e8ce34 100644 --- a/node_modules/ace/ChangeLog.txt +++ b/node_modules/ace/ChangeLog.txt @@ -1,5 +1,20 @@ +2015.07.11 Version 1.2.0 + +* New Features + - Indented soft wrap (danyaPostfactum) + - Rounded borders on selections + +* API Changes + - unified delta types `{start, end, action, lines}` (Alden Daniels https://github.com/ajaxorg/ace/pull/1745) + - "change" event listeners on session and editor get delta objects directly + +* new language modes + - SQLServer (Morgan Yarbrough) + 2015.04.03 Version 1.1.9 + - Small Enhancements and Bugfixes + 2014.11.08 Version 1.1.8 * API Changes diff --git a/node_modules/ace/Makefile.dryice.js b/node_modules/ace/Makefile.dryice.js index 0ce7c657..5a321f0d 100755 --- a/node_modules/ace/Makefile.dryice.js +++ b/node_modules/ace/Makefile.dryice.js @@ -284,7 +284,9 @@ function buildAceModuleInternal(opts, callback) { filters.push(exportAce(ns, opts.require[0], opts.noconflict ? ns : "", projectType == "ext")); } - + + filters.push(normalizeLineEndings); + filters.forEach(function(f) { code = f(code); }); build.writeToFile({code: code}, { @@ -409,7 +411,9 @@ function getLoadedFileList(options, callback, result) { } function normalizeLineEndings(module) { - module.source = module.source.replace(/\r\n/g, "\n"); + if (typeof module == "string") + module = {source: module}; + return module.source = module.source.replace(/\r\n/g, "\n"); } function optimizeTextModules(sources) { @@ -471,8 +475,10 @@ function namespace(ns) { text = text .toString() .replace(/ACE_NAMESPACE\s*=\s*""/, 'ACE_NAMESPACE = "' + ns +'"') - .replace(/(\.define)|\bdefine\(/g, function(_, a) { - return a || ns + ".define("; + .replace(/\bdefine\(/g, function(def, index, source) { + if (/(^|[;})])\s*$/.test(source.slice(0, index))) + return ns + "." + def; + return def; }); return text; diff --git a/node_modules/ace/demo/autoresize.html b/node_modules/ace/demo/autoresize.html index 73a87599..b0464ecd 100644 --- a/node_modules/ace/demo/autoresize.html +++ b/node_modules/ace/demo/autoresize.html @@ -7,14 +7,13 @@ @@ -24,6 +23,8 @@ 
minHeight = 2 lines
+

+

 

 
 
@@ -46,6 +47,13 @@ require(["ace/ace"], function(ace) {
     editor2.setOption("maxLines", 30);
     editor2.setOption("minLines", 2);
 
+    var editor = ace.edit("editor3");
+    editor.setOptions({
+        autoScrollEditorIntoView: true,
+        maxLines: 8
+    });
+    editor.renderer.setScrollMargin(10, 10, 10, 10);
+    
     var editor = ace.edit("editor");
     editor.setTheme("ace/theme/tomorrow");
     editor.session.setMode("ace/mode/html");
diff --git a/node_modules/ace/demo/kitchen-sink/dev_util.js b/node_modules/ace/demo/kitchen-sink/dev_util.js
index 8dab857c..a7b9b096 100644
--- a/node_modules/ace/demo/kitchen-sink/dev_util.js
+++ b/node_modules/ace/demo/kitchen-sink/dev_util.js
@@ -39,7 +39,7 @@ function warn() {
     s.shift(); // remove the getter
     s = s.join("\n");
     // allow easy access to ace in console, but not in ace code
-    if (!/at Object.InjectedScript.|@debugger eval|snippets:\/{3}/.test(s)) {
+    if (!/at Object.InjectedScript.|@debugger eval|snippets:\/{3}|:\d+:\d+/.test(s)) {
         console.error("trying to access to global variable");
     }
 }
diff --git a/node_modules/ace/demo/kitchen-sink/docs/c_cpp.cpp b/node_modules/ace/demo/kitchen-sink/docs/c_cpp.cpp
index a2ebdaa2..3e06ac24 100644
--- a/node_modules/ace/demo/kitchen-sink/docs/c_cpp.cpp
+++ b/node_modules/ace/demo/kitchen-sink/docs/c_cpp.cpp
@@ -24,10 +24,12 @@
    
 using namespace std;
 
+//
 int main ()
 {
     int a, b=3; /* foobar */
-    a = b;
+    a = b; // single line comment\
+        continued
     a+=2; // equivalent to a=a+2
     cout << a;
     #if VERBOSE >= 2
diff --git a/node_modules/ace/demo/kitchen-sink/docs/gherkin.feature b/node_modules/ace/demo/kitchen-sink/docs/gherkin.feature
index 52cd811e..83c6e844 100644
--- a/node_modules/ace/demo/kitchen-sink/docs/gherkin.feature
+++ b/node_modules/ace/demo/kitchen-sink/docs/gherkin.feature
@@ -1,4 +1,4 @@
-@these @are @tags
+@these @_are_ @tags
 Feature: Serve coffee
   Coffee should not be served until paid for
   Coffee should not be served until the button has been pressed
@@ -12,7 +12,7 @@ Feature: Serve coffee
     Examples:
       | start | eat | left |
       |  12   |  5  |  7   |
-      |  20   |  5  |  15  |    
+      |  @20  |  5  |  15  |    
 
   Scenario: Buy last coffee
     Given there are 1 coffees left in the machine
diff --git a/node_modules/ace/demo/kitchen-sink/docs/maze.mz b/node_modules/ace/demo/kitchen-sink/docs/maze.mz
new file mode 100644
index 00000000..72c140e2
--- /dev/null
+++ b/node_modules/ace/demo/kitchen-sink/docs/maze.mz
@@ -0,0 +1,23 @@
+## ## () ## ^^ ## ## ## ##
+## H1 C2 S1 <> S2 H2 DN ##
+## %U <> %D *2 %L IZ .. ##
+## ## ## .. ## DN *3 ## ##
+## ## ## %R C1 IZ () ## ##
+## ## ## ## >/ *1
+## () *3 *1 %L ()
+
+
+// Set divisor and dividend
+S1-> = 9
+S2-> = 24
+
+// Holding cells
+H1-> IF *1 THEN %R ELSE %N
+H2-> IF *2 THEN %R ELSE %N
+
+// Arithmetic
+DN-> -= 1
+IZ-> IF <= 0 THEN %D ELSE %U
+
+C1-> IF *3 THEN %D ELSE %R
+C2-> IF *3 THEN %U ELSE %D
diff --git a/node_modules/ace/demo/kitchen-sink/docs/sqlserver.sqlserver b/node_modules/ace/demo/kitchen-sink/docs/sqlserver.sqlserver
index 329930af..7efd2b7e 100644
--- a/node_modules/ace/demo/kitchen-sink/docs/sqlserver.sqlserver
+++ b/node_modules/ace/demo/kitchen-sink/docs/sqlserver.sqlserver
@@ -1,9 +1,9 @@
 -- =============================================
 -- Author:		Morgan Yarbrough
 -- Create date: 4/27/2015
--- Description:	Test Procedure that shows off language features.
--- 				Includes non-standard folding using region comments using either
--- 				line comments or block comments (both are demonstrated below)
+-- Description:	Test procedure that shows off language features.
+-- 				Includes non-standard folding with region comments using either
+-- 				line comments or block comments (both are demonstrated below).
 --				This mode imitates SSMS and it designed to be used with SQL Server theme.
 -- =============================================
 CREATE PROCEDURE dbo.TestProcedure
@@ -11,7 +11,7 @@ CREATE PROCEDURE dbo.TestProcedure
 --#region parameters
 	@vint INT = 1
 	,@vdate DATE = NULL
-	,@vdatetime DATETIME = DATEADD (dd, 1, GETDATE())
+	,@vdatetime DATETIME = DATEADD(dd, 1, GETDATE())
 	,@vvarchar VARCHAR(MAX) = ''
 --#endregion
 
@@ -38,8 +38,8 @@ BEGIN
 	-- another folding demonstration
 	IF @vint = 1 
 	BEGIN
-		SET @vvarchar='one'
-		SET @vint = DATEDIFFT(dd, @vdate, @vdatetime)
+		SET @vvarchar = 'one'
+		SET @vint = DATEDIFF(dd, @vdate, @vdatetime)
 	END
 	
 	-- this mode handles strings properly
@@ -47,7 +47,7 @@ BEGIN
 									FROM Orders
 									WHERE @OrderDate > GETDATE()'
 								
-	-- this mode is aware of build in stored procedures 
+	-- this mode is aware of built in stored procedures 
 	EXECUTE sp_executesql @sql
 	
 	-- demonstrating some syntax highlighting
@@ -60,4 +60,13 @@ BEGIN
 	WHERE CompanyName NOT LIKE '%something'
 		OR CompanyName IS NULL
 		OR CompanyName IN ('bla', 'nothing')
+		
+	-- this mode includes snippets
+	-- place your cusor at the end of the line below and trigger auto complete (Ctrl+Space)
+	createpr
+	
+	-- SQL Server allows using keywords as object names (not recommended) as long as they are wrapped in brackets
+	DATABASE -- keyword
+	[DATABASE] -- not a keyword
+	
 END
diff --git a/node_modules/ace/demo/kitchen-sink/docs/swift.swift b/node_modules/ace/demo/kitchen-sink/docs/swift.swift
new file mode 100644
index 00000000..d1b58293
--- /dev/null
+++ b/node_modules/ace/demo/kitchen-sink/docs/swift.swift
@@ -0,0 +1,16 @@
+import UIKit
+ 
+class DetailsViewController: UIViewController {
+    var album: Album?
+    @IBOutlet weak var albumCover: UIImageView!
+     
+    required init(coder aDecoder: NSCoder) {
+        super.init(coder: aDecoder)
+    }
+     
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        mLabel.text = self.album?.title && "Juhu \( "kinners" )! "
+        albumCover.image = UIImage(data: NSData(contentsOfURL: NSURL(string: self.album!.largeImageURL)!)!)
+    }
+}
\ No newline at end of file
diff --git a/node_modules/ace/demo/kitchen-sink/styles.css b/node_modules/ace/demo/kitchen-sink/styles.css
index 3f46f701..b9ace9c6 100644
--- a/node_modules/ace/demo/kitchen-sink/styles.css
+++ b/node_modules/ace/demo/kitchen-sink/styles.css
@@ -52,4 +52,6 @@ body {
     z-index: 10!important;
     opacity: 1!important;
     background: rgb(84, 0, 255)!important;
+    color: rgb(255, 255, 255)!important;
+    width: 10em!important;
 }*/
diff --git a/node_modules/ace/demo/static-highlighter/server.js b/node_modules/ace/demo/static-highlighter/server.js
index 0878fec2..ea8361d4 100644
--- a/node_modules/ace/demo/static-highlighter/server.js
+++ b/node_modules/ace/demo/static-highlighter/server.js
@@ -2,15 +2,13 @@
  * Simple node.js server, which generates the synax highlighted version of itself 
  * using the Ace modes and themes on the server and serving a static web page.
  */
-// $'
+
 // include ace search path and modules
 require("amd-loader");
 
-// load jsdom, which is required by Ace
-require("../../lib/ace/test/mockdom");
-
 var http = require("http");
 var fs = require("fs");
+var resolve = require("path").resolve;
 
 // load the highlighter and the desired mode and theme
 var highlighter = require("../../lib/ace/ext/static_highlight");
@@ -20,15 +18,22 @@ var theme = require("../../lib/ace/theme/twilight");
 var port = process.env.PORT || 2222;
 
 http.createServer(function(req, res) {
+    var url = req.url;
+    var path = /[^#?\x00]*/.exec(url)[0];
+    var root = resolve(__dirname + "/../../").replace(/\\/g, "/");
+    path = resolve(root + "/" + path).replace(/\\/g, "/");
+    if (path.indexOf(root + "/") != 0)
+        path = __filename;
     res.writeHead(200, {"Content-Type": "text/html; charset=utf-8"});
-    fs.readFile(__dirname + "/../../build/src/ace.js", "utf8", function(err, data) {
+    fs.readFile(path, "utf8", function(err, data) {
+        if (err) data = err.message;
         var highlighted = highlighter.render(data, new JavaScriptMode(), theme);
         res.end(
             '\n' +
                 '\n' + 
-                highlighted.html +            
+                highlighted.html +
             ''
         );
     });
diff --git a/node_modules/ace/demo/svg.svg b/node_modules/ace/demo/svg.svg
new file mode 100644
index 00000000..662ab53b
--- /dev/null
+++ b/node_modules/ace/demo/svg.svg
@@ -0,0 +1,11 @@
+
+    
+    
+    
+    
+        
Hi!

+    
+
\ No newline at end of file
diff --git a/node_modules/ace/demo/xml.xml b/node_modules/ace/demo/xml.xml
new file mode 100644
index 00000000..b4f78bf8
--- /dev/null
+++ b/node_modules/ace/demo/xml.xml
@@ -0,0 +1,33 @@
+
+
+
+
+    
+    ACE Autocompletion demo
+    
+
+
+    

+
+    
+    
+
+    
+
+
diff --git a/node_modules/ace/experiments/debug_mem_leak.html b/node_modules/ace/experiments/debug_mem_leak.html
new file mode 100644
index 00000000..b8ee8726
--- /dev/null
+++ b/node_modules/ace/experiments/debug_mem_leak.html
@@ -0,0 +1,59 @@
+
+
+    
+        
+        
+        
+    
+    
+        

+
+        

+        
+    
+
\ No newline at end of file
diff --git a/node_modules/ace/lib/ace/autocomplete.js b/node_modules/ace/lib/ace/autocomplete.js
index 8e121f35..bb3fe04b 100644
--- a/node_modules/ace/lib/ace/autocomplete.js
+++ b/node_modules/ace/lib/ace/autocomplete.js
@@ -174,7 +174,7 @@ var Autocomplete = function() {
         this.popup.setRow(row);
     };
 
-    this.insertMatch = function(data) {
+    this.insertMatch = function(data, options) {
         if (!data)
             data = this.popup.getData(this.popup.getRow());
         if (!data)
@@ -183,6 +183,7 @@ var Autocomplete = function() {
         if (data.completer && data.completer.insertMatch) {
             data.completer.insertMatch(this.editor, data);
         } else {
+            // TODO add support for options.deleteSuffix
             if (this.completions.filterText) {
                 var ranges = this.editor.selection.getAllRanges();
                 for (var i = 0, range; range = ranges[i]; i++) {
@@ -207,7 +208,7 @@ var Autocomplete = function() {
 
         "Esc": function(editor) { editor.completer.detach(); },
         "Return": function(editor) { return editor.completer.insertMatch(); },
-        "Shift-Return": function(editor) { editor.completer.insertMatch(true); },
+        "Shift-Return": function(editor) { editor.completer.insertMatch(null, {deleteSuffix: true}); },
         "Tab": function(editor) {
             var result = editor.completer.insertMatch();
             if (!result && !editor.tabstopManager)
diff --git a/node_modules/ace/lib/ace/ext/modelist.js b/node_modules/ace/lib/ace/ext/modelist.js
index 14db899d..c5c86bd6 100644
--- a/node_modules/ace/lib/ace/ext/modelist.js
+++ b/node_modules/ace/lib/ace/ext/modelist.js
@@ -150,6 +150,7 @@ var supportedModes = {
     SQLServer:   ["sqlserver"],
     Stylus:      ["styl|stylus"],
     SVG:         ["svg"],
+    Swift:       ["swift"],
     Tcl:         ["tcl"],
     Tex:         ["tex"],
     Text:        ["txt"],
diff --git a/node_modules/ace/lib/ace/lib/dom.js b/node_modules/ace/lib/ace/lib/dom.js
index c30176da..dfc32079 100644
--- a/node_modules/ace/lib/ace/lib/dom.js
+++ b/node_modules/ace/lib/ace/lib/dom.js
@@ -136,10 +136,7 @@ exports.importCssString = function importCssString(cssText, id, doc) {
         if (id)
             style.owningElement.id = id;
     } else {
-        style = doc.createElementNS
-            ? doc.createElementNS(XHTML_NS, "style")
-            : doc.createElement("style");
-
+        style = exports.createElement("style");
         style.appendChild(doc.createTextNode(cssText));
         if (id)
             style.id = id;
diff --git a/node_modules/ace/lib/ace/lib/event.js b/node_modules/ace/lib/ace/lib/event.js
index 8892557c..459ce0f2 100644
--- a/node_modules/ace/lib/ace/lib/event.js
+++ b/node_modules/ace/lib/ace/lib/event.js
@@ -34,6 +34,9 @@ define(function(require, exports, module) {
 var keys = require("./keys");
 var useragent = require("./useragent");
 
+var pressedKeys = null;
+var ts = 0;
+
 exports.addListener = function(elem, type, callback) {
     if (elem.addEventListener) {
         return elem.addEventListener(type, callback, false);
@@ -253,7 +256,7 @@ function normalizeCommandKeys(callback, e, keyCode) {
     var hashId = getModifierHash(e);
 
     if (!useragent.isMac && pressedKeys) {
-        if (pressedKeys[91] || pressedKeys[92])
+        if (pressedKeys.OSKey)
             hashId |= 8;
         if (pressedKeys.altGr) {
             if ((3 & hashId) != 3)
@@ -278,7 +281,7 @@ function normalizeCommandKeys(callback, e, keyCode) {
         keyCode = -1;
     }
 
-    if (hashId & 8 && (keyCode === 91 || keyCode === 93)) {
+    if (hashId & 8 && (keyCode === 91 || keyCode === 92)) {
         keyCode = -1;
     }
     
@@ -309,8 +312,7 @@ function normalizeCommandKeys(callback, e, keyCode) {
     return callback(e, hashId, keyCode);
 }
 
-var pressedKeys = null;
-var ts = 0;
+
 exports.addCommandKeyListener = function(el, callback) {
     var addListener = exports.addListener;
     if (useragent.isOldGecko || (useragent.isOpera && !("KeyboardEvent" in window))) {
@@ -331,8 +333,19 @@ exports.addCommandKeyListener = function(el, callback) {
         var lastDefaultPrevented = null;
 
         addListener(el, "keydown", function(e) {
-            pressedKeys[e.keyCode] = (pressedKeys[e.keyCode] || 0) + 1;
-            var result = normalizeCommandKeys(callback, e, e.keyCode);
+            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);
             lastDefaultPrevented = e.defaultPrevented;
             return result;
         });
@@ -345,7 +358,17 @@ exports.addCommandKeyListener = function(el, callback) {
         });
 
         addListener(el, "keyup", function(e) {
-            pressedKeys[e.keyCode] = null;
+            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;
         });
 
         if (!pressedKeys) {
@@ -354,8 +377,11 @@ exports.addCommandKeyListener = function(el, callback) {
         }
     }
 };
-function resetPressedKeys(e) {
+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/lib/keys.js b/node_modules/ace/lib/ace/lib/keys.js
index 465d4a8d..cca7ff24 100644
--- a/node_modules/ace/lib/ace/lib/keys.js
+++ b/node_modules/ace/lib/ace/lib/keys.js
@@ -105,7 +105,7 @@ var Keys = (function() {
            80: 'p',  81: 'q',  82: 'r',  83: 's',  84: 't',  85: 'u', 86:  'v',
            87: 'w',  88: 'x',  89: 'y',  90: 'z', 107: '+', 109: '-', 110: '.',
           186: ';', 187: '=', 188: ',', 189: '-', 190: '.', 191: '/', 192: '`',
-          219: '[', 220: '\\',221: ']', 222: '\''
+          219: '[', 220: '\\',221: ']', 222: "'", 111: '/', 106: '*'
         }
     };
 
diff --git a/node_modules/ace/lib/ace/mode/_test/highlight_rules_test.js b/node_modules/ace/lib/ace/mode/_test/highlight_rules_test.js
index c3b877ec..bd15526e 100644
--- a/node_modules/ace/lib/ace/mode/_test/highlight_rules_test.js
+++ b/node_modules/ace/lib/ace/mode/_test/highlight_rules_test.js
@@ -29,26 +29,42 @@ function checkModes() {
             return;
         }
         var m = new Mode();
-        if (!m.lineCommentStart && !m.blockComment)
+        if (!("lineCommentStart" in m) && !("blockComment" in m))
             console.warn("missing comment in " + modeName);
         if (!m.$id)
             console.warn("missing id in " + modeName);
         var tokenizer = (new Mode).getTokenizer();
-        if (m.lineCommentStart) {
-            if (Array.isArray(m.lineCommentStart)) {
-                m.lineCommentStart.forEach(function(x) {
-                    testLineComment(tokenizer, x, modeName)
+        
+        testComments(m.lineCommentStart, testLineComment, tokenizer, modeName);
+        testComments(m.blockComment, testBlockComment, tokenizer, modeName);
+    });
+    
+    function testComments(desc, fn, tokenizer, modeName) {
+        if (desc) {
+            if (Array.isArray(desc)) {
+                desc.forEach(function(x) {
+                    fn(tokenizer, x, modeName)
                 });
             } else {
-                testLineComment(tokenizer, m.lineCommentStart, modeName)
+                fn(tokenizer, desc, modeName)
             }
         }
-        // if (m.blockComment) {
-        //     var tokens = tok.getLineTokens(m.lineCommentStart, "start");
-        //     if (!/comment/.test(tokens[0]))
-        //         console.warn("broken lineCommentStart in " + modeName);
-        // }
-    });
+    }
+    
+    function testBlockComment(tokenizer, blockComment, modeName) {
+        if (blockComment.lineStartOnly)
+            return; // TODO test 
+        var str = blockComment.start + " " + blockComment.end;
+        str = blockComment.start + str;
+        if (blockComment.nestable)
+            str += blockComment.end;     
+        var data = tokenizer.getLineTokens(str, "start");
+        var isBroken = data.tokens.some(function(t) { return !/comment/.test(t.type) });
+        if (isBroken)
+            console.warn("broken blockComment in " + modeName, data);
+        if (!/start/.test(data.state))
+            console.warn("broken state after blockComment in " + modeName, data);
+    }
     
     function testLineComment(tokenizer, commentStart, modeName) {
         var tokens = tokenizer.getLineTokens(commentStart + " ", "start").tokens;
@@ -198,9 +214,10 @@ function padNumber(num, digits) {
 
 // cli
 var arg = process.argv[2];
-if (!arg)
+if (!arg) {
     test();
-else if (/--?g(en)?/.test(arg))
+    checkModes();
+} else if (/--?g(en)?/.test(arg))
     generateTestData(process.argv.splice(3));
 else if (/--?c(heck)?/.test(arg))
     checkModes(process.argv.splice(3));
diff --git a/node_modules/ace/lib/ace/mode/_test/text_coldfusion.txt b/node_modules/ace/lib/ace/mode/_test/text_coldfusion.txt
new file mode 100644
index 00000000..9dd432bc
--- /dev/null
+++ b/node_modules/ace/lib/ace/mode/_test/text_coldfusion.txt
@@ -0,0 +1,8 @@
+
+
+  z ---> welcome="Hello World!">
+  z -->
+#welcome#
+
+    Dateformat(now())
+
\ No newline at end of file
diff --git a/node_modules/ace/lib/ace/mode/_test/text_javascript.txt b/node_modules/ace/lib/ace/mode/_test/text_javascript.txt
index 48d4af7d..569c8537 100644
--- a/node_modules/ace/lib/ace/mode/_test/text_javascript.txt
+++ b/node_modules/ace/lib/ace/mode/_test/text_javascript.txt
@@ -84,3 +84,11 @@ foo.protoype.d = function(a, b,
                           c, d)
 foo.d =function(a,     b)
 foo.d =function(a,  /*****/ d"string"   
+
+
+
diff --git a/node_modules/ace/lib/ace/mode/_test/tokens_c_cpp.json b/node_modules/ace/lib/ace/mode/_test/tokens_c_cpp.json
index 312dad62..13f42b13 100644
--- a/node_modules/ace/lib/ace/mode/_test/tokens_c_cpp.json
+++ b/node_modules/ace/lib/ace/mode/_test/tokens_c_cpp.json
@@ -83,7 +83,7 @@
    "start"
 ],[
    "start",
-   ["comment","//"]
+  ["comment","//"]
 ],[
    "start",
   ["storage.type","int"],
@@ -110,7 +110,7 @@
   ["text"," "],
   ["comment","/* foobar */"]
 ],[
-   "start",
+   "singleLineComment",
   ["text","    "],
   ["identifier","a"],
   ["text"," "],
@@ -119,7 +119,10 @@
   ["identifier","b"],
   ["punctuation.operator",";"],
   ["text"," "],
-  ["comment","// single line comment\\        continued"]
+  ["comment","// single line comment\\"]
+],[
+   "start",
+  ["comment","        continued"]
 ],[
    "start",
   ["text","    "],
diff --git a/node_modules/ace/lib/ace/mode/_test/tokens_coffee.json b/node_modules/ace/lib/ace/mode/_test/tokens_coffee.json
index b0703b37..cf024632 100644
--- a/node_modules/ace/lib/ace/mode/_test/tokens_coffee.json
+++ b/node_modules/ace/lib/ace/mode/_test/tokens_coffee.json
@@ -10,8 +10,8 @@
   ["identifier","i"],
   ["text"," "],
   ["constant.numeric","1"],
-  ["punctuation.operator","."],
-  ["constant.numeric",".2"],
+  ["punctuation.operator",".."],
+  ["constant.numeric","2"],
   ["paren.rparen",")"]
 ],[
    "start",
diff --git a/node_modules/ace/lib/ace/mode/_test/tokens_coldfusion.json b/node_modules/ace/lib/ace/mode/_test/tokens_coldfusion.json
index 804e647d..d7dd1269 100644
--- a/node_modules/ace/lib/ace/mode/_test/tokens_coldfusion.json
+++ b/node_modules/ace/lib/ace/mode/_test/tokens_coldfusion.json
@@ -1,26 +1,59 @@
 [[
    "start",
-  ["comment.xml",""]
+  ["comment.start",""]
 ],[
    "start"
 ],[
    "start",
   ["meta.tag.punctuation.tag-open.xml","<"],
-  ["meta.tag.tag-name.xml","cfset"],
+  ["keyword.tag-name.xml","cfset"],
+  ["text.tag-whitespace.xml"," "],
+  ["comment.start",""],
+  ["comment","  z "],
+  ["comment.end","--->"],
   ["text.tag-whitespace.xml"," "],
   ["entity.other.attribute-name.xml","welcome"],
   ["keyword.operator.attribute-equals.xml","="],
   ["string.attribute-value.xml","\"Hello World!\""],
   ["meta.tag.punctuation.tag-close.xml",">"]
 ],[
-   "start"
+   "start",
+  ["comment.xml",""],
+  ["comment.xml","  z -->"]
 ],[
    "start",
   ["meta.tag.punctuation.tag-open.xml","<"],
-  ["meta.tag.tag-name.xml","cfoutput"],
+  ["keyword.tag-name.xml","cfoutput"],
   ["meta.tag.punctuation.tag-close.xml",">"],
   ["text.xml","#welcome#"],
   ["meta.tag.punctuation.end-tag-open.xml",""]
+],[
+   "cfjs-start",
+  ["meta.tag.punctuation.tag-open.xml","<"],
+  ["meta.tag.cfscript.tag-name.xml","cfscript"],
+  ["meta.tag.punctuation.tag-close.xml",">"]
+],[
+   "cfjs-no_regex",
+  ["text","    "],
+  ["identifier","Dateformat"],
+  ["paren.lparen","("],
+  ["identifier","now"],
+  ["paren.lparen","("],
+  ["paren.rparen","))"]
+],[
+   "start",
+  ["meta.tag.punctuation.end-tag-open.xml",""]
 ]]
\ No newline at end of file
diff --git a/node_modules/ace/lib/ace/mode/_test/tokens_javascript.json b/node_modules/ace/lib/ace/mode/_test/tokens_javascript.json
index 1be3f605..b52a31bc 100644
--- a/node_modules/ace/lib/ace/mode/_test/tokens_javascript.json
+++ b/node_modules/ace/lib/ace/mode/_test/tokens_javascript.json
@@ -590,4 +590,70 @@
   ["text","   "]
 ],[
    "no_regex"
+],[
+   "no_regex",
+  ["keyword.operator","<"],
+  ["identifier","div"]
+],[
+   ["start","jsx_attr_qq","jsx_attr_qq","jsxAttributes","jsxAttributes","jsx",1],
+  ["identifier","z"],
+  ["keyword.operator","="],
+  ["meta.tag.punctuation.tag-open.xml","<"],
+  ["meta.tag.tag-name.xml","div"],
+  ["text.tag-whitespace.xml"," "],
+  ["paren.quasi.start","{"],
+  ["keyword.operator","..."],
+  ["variable.language","this"],
+  ["punctuation.operator","."],
+  ["identifier","props"],
+  ["paren.quasi.end","}"],
+  ["text.tag-whitespace.xml"," "],
+  ["entity.other.attribute-name.xml","x"],
+  ["keyword.operator.attribute-equals.xml","="],
+  ["paren.quasi.start","{"],
+  ["constant.numeric","1"],
+  ["text"," "],
+  ["keyword.operator","+"],
+  ["text"," "],
+  ["constant.numeric","2"],
+  ["paren.quasi.end","}"],
+  ["text.tag-whitespace.xml"," "],
+  ["entity.other.attribute-name.xml","y"],
+  ["keyword.operator.attribute-equals.xml","="],
+  ["string.attribute-value.xml","\"z"],
+  ["paren.quasi.start","{"]
+],[
+   ["#tmp","no_regex","start","jsx_attr_qq","jsx_attr_qq","jsxAttributes","jsxAttributes","jsx",1],
+  ["text","        "],
+  ["constant.numeric","1"]
+],[
+   ["jsx",1],
+  ["text","    "],
+  ["paren.quasi.end","}"],
+  ["string.attribute-value.xml","e\""],
+  ["meta.tag.punctuation.tag-close.xml",">"]
+],[
+   ["jsx",1],
+  ["string","1 "],
+  ["meta.tag.punctuation.tag-open.xml","<"],
+  ["meta.tag.tag-name.xml","a"],
+  ["meta.tag.punctuation.tag-close.xml",">"],
+  ["string"," "],
+  ["paren.quasi.start","{"],
+  ["text"," "],
+  ["keyword.operator","++"],
+  ["identifier","x"],
+  ["text","  "],
+  ["paren.quasi.end","}"],
+  ["string"," "],
+  ["meta.tag.punctuation.end-tag-open.xml",""]
+],[
+   "start",
+  ["meta.tag.punctuation.end-tag-open.xml",""]
+],[
+   "start"
 ]]
\ No newline at end of file
diff --git a/node_modules/ace/lib/ace/mode/_test/tokens_markdown.json b/node_modules/ace/lib/ace/mode/_test/tokens_markdown.json
index 29e878b2..3ac5c131 100644
--- a/node_modules/ace/lib/ace/mode/_test/tokens_markdown.json
+++ b/node_modules/ace/lib/ace/mode/_test/tokens_markdown.json
@@ -110,5 +110,5 @@
 ],[
    "allowBlock"
 ],[
-   "start"
-]]
\ No newline at end of file
+   "allowBlock"
+]]
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 fc05b78f..c8d3c20e 100644
--- a/node_modules/ace/lib/ace/mode/_test/tokens_rust.json
+++ b/node_modules/ace/lib/ace/mode/_test/tokens_rust.json
@@ -210,4 +210,4 @@
   ["paren.rparen","}"]
 ],[
    "start"
-]]
+]]
\ No newline at end of file
diff --git a/node_modules/ace/lib/ace/mode/_test/tokens_scala.json b/node_modules/ace/lib/ace/mode/_test/tokens_scala.json
index 01dd3ce3..e59e55dc 100644
--- a/node_modules/ace/lib/ace/mode/_test/tokens_scala.json
+++ b/node_modules/ace/lib/ace/mode/_test/tokens_scala.json
@@ -115,7 +115,7 @@
   ["text"," "],
   ["keyword","extends"],
   ["text"," "],
-  ["identifier","Application"],
+  ["support.function","Application"],
   ["text"," "],
   ["paren.lparen","{"]
 ],[
@@ -205,7 +205,7 @@
 ],[
    "start",
   ["text","    "],
-  ["identifier","println"],
+  ["keyword","println"],
   ["paren.lparen","("],
   ["string","\"Ping: Initializing with count \""],
   ["keyword.operator","+"],
@@ -248,7 +248,7 @@
 ],[
    "start",
   ["text","          "],
-  ["identifier","println"],
+  ["keyword","println"],
   ["paren.lparen","("],
   ["string","\"Ping: starting.\""],
   ["paren.rparen",")"]
@@ -327,7 +327,7 @@
 ],[
    "start",
   ["text","            "],
-  ["identifier","println"],
+  ["keyword","println"],
   ["paren.lparen","("],
   ["string","\"Ping: pong from: \""],
   ["keyword.operator","+"],
@@ -362,7 +362,7 @@
 ],[
    "start",
   ["text","            "],
-  ["identifier","println"],
+  ["keyword","println"],
   ["paren.lparen","("],
   ["string","\"Ping: Stop.\""],
   ["paren.rparen",")"]
@@ -472,7 +472,7 @@
 ],[
    "start",
   ["text","            "],
-  ["identifier","println"],
+  ["keyword","println"],
   ["paren.lparen","("],
   ["string","\"Pong: ping \""],
   ["keyword.operator","+"],
@@ -513,7 +513,7 @@
 ],[
    "start",
   ["text","          "],
-  ["identifier","println"],
+  ["keyword","println"],
   ["paren.lparen","("],
   ["string","\"Pong: Stop.\""],
   ["paren.rparen",")"]
diff --git a/node_modules/ace/lib/ace/mode/_test/tokens_soy_template.json b/node_modules/ace/lib/ace/mode/_test/tokens_soy_template.json
index 9ae7c4ed..c4f95095 100644
--- a/node_modules/ace/lib/ace/mode/_test/tokens_soy_template.json
+++ b/node_modules/ace/lib/ace/mode/_test/tokens_soy_template.json
@@ -110,8 +110,8 @@
   ["punctuation.definition.tag.end.soy","}"]
 ],[
    "start",
-  ["comment.line.double-slash.soy","  "],
-  ["punctuation.definition.comment.soy","//"],
+  ["text.xml","  "],
+  ["comment.line.double-slash.soy","//"],
   ["comment.line.double-slash.soy"," Greet the person."]
 ],[
    "start",
@@ -130,8 +130,8 @@
   ["meta.tag.punctuation.tag-close.xml",">"]
 ],[
    "start",
-  ["comment.line.double-slash.soy","  "],
-  ["punctuation.definition.comment.soy","//"],
+  ["text.xml","  "],
+  ["comment.line.double-slash.soy","//"],
   ["comment.line.double-slash.soy"," Greet the additional people."]
 ],[
    "start",
@@ -189,8 +189,8 @@
   ["meta.tag.punctuation.tag-open.xml","<"],
   ["meta.tag.tag-name.xml","br"],
   ["meta.tag.punctuation.tag-close.xml",">"],
-  ["comment.line.double-slash.soy","  "],
-  ["punctuation.definition.comment.soy","//"],
+  ["text.xml","  "],
+  ["comment.line.double-slash.soy","//"],
   ["comment.line.double-slash.soy"," break after every line except the last"]
 ],[
    "start",
diff --git a/node_modules/ace/lib/ace/mode/coffee_highlight_rules.js b/node_modules/ace/lib/ace/mode/coffee_highlight_rules.js
index 94c9476f..3cad2843 100644
--- a/node_modules/ace/lib/ace/mode/coffee_highlight_rules.js
+++ b/node_modules/ace/lib/ace/mode/coffee_highlight_rules.js
@@ -167,7 +167,7 @@ define(function(require, exports, module) {
                     regex : "(\\.)(\\s*)(" + illegal + ")"
                 }, {
                     token : "punctuation.operator",
-                    regex : "\\."
+                    regex : "\\.{1,3}"
                 }, {
                     //class A extends B
                     token : ["keyword", "text", "language.support.class",
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 5feff6d6..0004e8ee 100644
--- a/node_modules/ace/lib/ace/mode/coldfusion_highlight_rules.js
+++ b/node_modules/ace/lib/ace/mode/coldfusion_highlight_rules.js
@@ -37,8 +37,45 @@ var HtmlHighlightRules = require("./html_highlight_rules").HtmlHighlightRules;
 
 var ColdfusionHighlightRules = function() {
     HtmlHighlightRules.call(this);
+    this.$rules.tag[2].token = function (start, tag) {
+        var group = tag.slice(0,2) == "cf" ? "keyword" : "meta.tag";
+        return ["meta.tag.punctuation." + (start == "<" ? "" : "end-") + "tag-open.xml",
+            group + ".tag-name.xml"];
+    }
 
-    this.embedTagRules(JavaScriptHighlightRules, "cfjs-", "cfscript");
+    var jsAndCss = Object.keys(this.$rules).filter(function(x) {
+        return /^(js|css)-/.test(x);
+    });
+    this.embedRules({
+        cfmlComment: [
+            { regex: "", token: "comment.end", next: "pop"},
+            { defaultToken: "comment"}
+        ]
+    }, "", [
+        { regex: "