From 031140baa8648881fb191967bcc051f7b868d577 Mon Sep 17 00:00:00 2001 From: nightwing Date: Mon, 4 Jan 2016 18:58:59 +0400 Subject: [PATCH 1/5] update running state of output panel when another user presses run --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index bacc98af..06dac71b 100644 --- a/package.json +++ b/package.json @@ -103,13 +103,13 @@ "c9.ide.recentfiles": "#7c099abf40", "c9.ide.remote": "#301d2ab519", "c9.ide.processlist": "#2b12cd1bdd", - "c9.ide.run": "#e449c6c0f8", + "c9.ide.run": "#8248b35394", "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#70aeb327c0", "c9.ide.save": "#9461acd953", "c9.ide.scm": "#930a9e6f00", "c9.ide.terminal.monitor": "#e26502f0df", - "c9.ide.test": "#5b4c724bf6", + "c9.ide.test": "#8f21f662d3", "c9.ide.test.mocha": "#fc053b23d2", "c9.ide.theme.flat": "#92cda0fb40", "c9.ide.threewaymerge": "#229382aa0b", From aa027010dfef5759071bfa518fcde37b8eb54539 Mon Sep 17 00:00:00 2001 From: nightwing Date: Tue, 5 Jan 2016 02:59:06 +0400 Subject: [PATCH 2/5] sometimes breakpoint.path can be undefined --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 06dac71b..2f0fa82c 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,7 @@ "c9.ide.processlist": "#2b12cd1bdd", "c9.ide.run": "#8248b35394", "c9.ide.run.build": "#0598fff697", - "c9.ide.run.debug.xdebug": "#70aeb327c0", + "c9.ide.run.debug.xdebug": "#518f5a0c66", "c9.ide.save": "#9461acd953", "c9.ide.scm": "#930a9e6f00", "c9.ide.terminal.monitor": "#e26502f0df", From 9ba9a32fe549ecea57ff15e6455c240bbc2a1aec Mon Sep 17 00:00:00 2001 From: nightwing Date: Tue, 5 Jan 2016 03:48:38 +0400 Subject: [PATCH 3/5] allow previewing pdf files --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2f0fa82c..581347be 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "c9.ide.newresource": "#981a408a7b", "c9.ide.openfiles": "#7fa4a97fed", "c9.ide.preview": "#8f87ff2f6a", - "c9.ide.preview.browser": "#cec211a76a", + "c9.ide.preview.browser": "#c5b9a129de", "c9.ide.preview.markdown": "#bc846e1562", "c9.ide.pubsub": "#a85fb27eca", "c9.ide.readonly": "#e67bb593bd", From df521f01715932e3d12735cecf4f3320b7743b8f Mon Sep 17 00:00:00 2001 From: nightwing Date: Wed, 6 Jan 2016 15:52:14 +0400 Subject: [PATCH 4/5] fix error when undoing deletion of fold --- node_modules/ace/lib/ace/edit_session.js | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/node_modules/ace/lib/ace/edit_session.js b/node_modules/ace/lib/ace/edit_session.js index 263592d8..32db04b9 100644 --- a/node_modules/ace/lib/ace/edit_session.js +++ b/node_modules/ace/lib/ace/edit_session.js @@ -1195,19 +1195,23 @@ EditSession.$uid = 0; return isUndo ? delta.action !== "insert" : delta.action === "insert"; } - var delta = deltas[0]; var range, point; - var lastDeltaIsInsert = false; - if (isInsert(delta)) { - range = Range.fromPoints(delta.start, delta.end); - lastDeltaIsInsert = true; - } else { - range = Range.fromPoints(delta.start, delta.start); - lastDeltaIsInsert = false; - } + var lastDeltaIsInsert; for (var i = 1; i < deltas.length; i++) { - delta = deltas[i]; + var delta = deltas[i]; + if (!delta.start) continue; // skip folds + if (!range) { + if (isInsert(delta)) { + range = Range.fromPoints(delta.start, delta.end); + lastDeltaIsInsert = true; + } else { + range = Range.fromPoints(delta.start, delta.start); + lastDeltaIsInsert = false; + } + continue; + } + if (isInsert(delta)) { point = delta.start; if (range.compare(point.row, point.column) == -1) { From 2b965228e5b1322bfb83ebddc5d45bb719193139 Mon Sep 17 00:00:00 2001 From: nightwing Date: Wed, 6 Jan 2016 16:19:16 +0400 Subject: [PATCH 5/5] enable all plugin experiments when debug=2 --- plugins/c9.ide.plugins/debug.js | 2 +- plugins/c9.ide.plugins/installer.js | 3 ++- plugins/c9.ide.plugins/loader.js | 5 +++-- plugins/c9.ide.plugins/packages.js | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/plugins/c9.ide.plugins/debug.js b/plugins/c9.ide.plugins/debug.js index 6dd9f0c1..1c46a254 100644 --- a/plugins/c9.ide.plugins/debug.js +++ b/plugins/c9.ide.plugins/debug.js @@ -43,7 +43,7 @@ define(function(require, exports, module) { var plugins = []; var ENABLED = c9.location.indexOf("debug=2") > -1; - var HASSDK = experimental.addExperiment("sdk", false, "SDK/Load Custom Plugins");; + var HASSDK = ENABLED || experimental.addExperiment("sdk", false, "SDK/Load Custom Plugins"); var reParts = /^(builders|keymaps|modes|outline|runners|snippets|themes)\/(.*)/; var reModule = /(?:_highlight_rules|_test|_worker|_fold|_behaviou?r)\.js$/; diff --git a/plugins/c9.ide.plugins/installer.js b/plugins/c9.ide.plugins/installer.js index 5e166437..6500723f 100644 --- a/plugins/c9.ide.plugins/installer.js +++ b/plugins/c9.ide.plugins/installer.js @@ -27,7 +27,8 @@ define(function(require, exports, module) { var plugin = new Plugin("Ajax.org", main.consumes); var emit = plugin.getEmitter(); - var HASSDK = experimental.addExperiment("sdk", false, "SDK/Load Custom Plugins"); + var DEBUG_MODE = c9.location.indexOf("debug=2") > -1; + var HASSDK = DEBUG_MODE || experimental.addExperiment("sdk", false, "SDK/Load Custom Plugins"); var installing; diff --git a/plugins/c9.ide.plugins/loader.js b/plugins/c9.ide.plugins/loader.js index 8d4e8f25..ab8ad3b9 100644 --- a/plugins/c9.ide.plugins/loader.js +++ b/plugins/c9.ide.plugins/loader.js @@ -28,8 +28,9 @@ define(function(require, exports, module) { var plugin = new Plugin("Ajax.org", main.consumes); // var emit = plugin.getEmitter(); - var ENABLED = experimental.addExperiment("plugins", false, "SDK/Load Plugins From Workspace"); - var HASSDK = experimental.addExperiment("sdk", false, "SDK/Load Custom Plugins"); + var DEBUG_MODE = c9.location.indexOf("debug=2") > -1; + var ENABLED = DEBUG_MODE || experimental.addExperiment("plugins", false, "SDK/Load Plugins From Workspace"); + var HASSDK = DEBUG_MODE || experimental.addExperiment("sdk", false, "SDK/Load Custom Plugins"); var plugins = options.plugins; var loadFromDisk = options.loadFromDisk diff --git a/plugins/c9.ide.plugins/packages.js b/plugins/c9.ide.plugins/packages.js index 310865d1..955a820f 100644 --- a/plugins/c9.ide.plugins/packages.js +++ b/plugins/c9.ide.plugins/packages.js @@ -31,7 +31,8 @@ define(function(require, exports, module) { var emit = handle.getEmitter(); emit.setMaxListeners(1000); - var HASSDK = experimental.addExperiment("sdk", false, "SDK/Load Custom Plugins"); + var DEBUG_MODE = c9.location.indexOf("debug=2") > -1; + var HASSDK = DEBUG_MODE || experimental.addExperiment("sdk", false, "SDK/Load Custom Plugins"); function focusOpenPackages(){ var pages = tabs.getTabs();