fix small regressions caused by ace update

joeithub · Jun 27, 2018 · d8917f3 · d8917f3
1 parent e5274f2
commit d8917f3
Show file tree

Hide file tree

Showing 10 changed files with 57 additions and 36 deletions.
diff --git a/plugins/c9.ide.collab/chat/chat.js b/plugins/c9.ide.collab/chat/chat.js
@@ -89,6 +89,7 @@ define(function(require, exports, module) {
                 minLines: 2,
                 fontFamily: "inherit"
             });
+            chatInput.ace.session.$enableVarChar = true;
             chatInput.ace.session.$setFontMetrics(chatInput.ace.renderer.$fontMetrics);
 
             plugin.addElement(chatInput);

diff --git a/plugins/c9.ide.immediate/style.css b/plugins/c9.ide.immediate/style.css
@@ -143,6 +143,10 @@
 .ace_lineWidgetContainer:after{
     background: transparent;
 }
+.ace_lineWidgetContainer {
+    z-index: 5;
+    position: absolute;
+}
 
 /* ace_dark */
 

diff --git a/plugins/c9.ide.layout.classic/layout.js b/plugins/c9.ide.layout.classic/layout.js
@@ -483,7 +483,7 @@ define(function(require, exports, module) {
                     return callback();
 
                 anims.animateSplitBoxNode(amlNode, {
-                    height: amlNode.$ext.scrollHeight + "px",
+                    height: amlNode.$ext.offsetHeight + "px",
                     duration: 0.2,
                     timingFunction: "cubic-bezier(.10, .10, .25, .90)"
                 }, function() {

diff --git a/plugins/c9.ide.run.debug/callstack.js b/plugins/c9.ide.run.debug/callstack.js
@@ -39,7 +39,7 @@ define(function(require, exports, module) {
         var sources = [];
         var frames = [];
 
-        var activeFrame, dbg, menu, button, lastException;
+        var activeFrame, dbg, menu, button, lastException, sourceListTimer;
 
         var loaded = false;
         function load() {
@@ -578,7 +578,7 @@ define(function(require, exports, module) {
 
         function loadSources(input) {
             sources = input;
-            modelSources.setRoot(sources);
+            updateSourceTree();
         }
 
         function clearFrames() {
@@ -587,7 +587,15 @@ define(function(require, exports, module) {
 
         function addSource(source) {
             sources.push(source);
-            modelSources.setRoot(sources);
+            updateSourceTree();
+        }
+
+        function updateSourceTree() {
+            if (sourceListTimer) return;
+            sourceListTimer = setTimeout(function() {
+                sourceListTimer = null;
+                modelSources.setRoot(sources);
+            }, 100);
         }
 
         function updateAll() {

diff --git a/plugins/c9.ide.run.debug/watches.js b/plugins/c9.ide.run.debug/watches.js
@@ -100,6 +100,8 @@ define(function(require, exports, module) {
                 updateAll();
             });
             debug.on("exception", function(e) {
+                if (errorWatch)
+                    removeWatch(errorWatch);
                 errorWatch = e.exception;
                 addWatch(errorWatch);
                 model.expand(errorWatch);

diff --git a/plugins/c9.ide.terminal/style.css b/plugins/c9.ide.terminal/style.css
@@ -103,4 +103,8 @@
 .c9terminalcontainer .cover-link:hover {
     opacity: 1;
     text-decoration: underline;
-}
+}
+
+.terminal > .ace_line {
+    contain: style size layout!important;
+}
diff --git a/plugins/c9.ide.terminal/terminal.js b/plugins/c9.ide.terminal/terminal.js
@@ -668,13 +668,12 @@ define(function(require, exports, module) {
                     var screenBottom = config.height - coverHeight + config.offset + 2;
                     var screenRight = (cols - this.width) * config.characterWidth;
 
-                    html.push("<div style='height:", coverHeight, "px;", "left:0; right: ", screenRight, "px; top:", screenBottom, "px;' ", 
-                            "class='c9terminalcontainer cover bottom'></div>",
-                        "<div style='width:", screenRight, "px; height: ", screenBottom, "px; top:0; right:0;' ",
-                            "class='c9terminalcontainer cover right'></div>",
-                        "<div style='width:", screenRight, "px; bottom:0; top:", screenBottom, "px; right:0;' ",
-                            "class='c9terminalcontainer cover'></div>"
-                    );
+                    markerLayer.elt("c9terminalcontainer cover bottom",
+                        "height:" + coverHeight + "px;" + "left:0; right: " + screenRight + "px; top:" + screenBottom + "px;");
+                    markerLayer.elt("c9terminalcontainer cover right",
+                        "width:" + screenRight + "px; height: " + screenBottom + "px; top:0; right:0;");
+                    markerLayer.elt("c9terminalcontainer cover",
+                        "width:" + screenRight + "px; bottom:0; top:" + screenBottom + "px; right:0;");
                 };
                 aceSession.addDynamicMarker(marker, true);
                 aceSession.term.tmuxDotCover = marker;

diff --git a/plugins/c9.vfs.standalone/standalone.js b/plugins/c9.vfs.standalone/standalone.js
@@ -227,7 +227,7 @@ function plugin(options, imports, register) {
         var base = __dirname + "/../../";
         var blacklistfile = base + "/test/blacklist.txt";
         var filefinder = require(base + "/test/lib/filefinder.js");
-        filefinder.find(base, "plugins", ".*_test.js", blacklistfile, function(err, result) {
+        filefinder.find(base, "plugins", ".*_test.(js|ts)", blacklistfile, function(err, result) {
             result.all = result.list.concat(result.blacklist);
             async.filterSeries(result.list, function(path, next) {
                 fs.readFile(base + path, "utf8", function(err, file) {

diff --git a/plugins/node_modules/ace_tree/lib/ace_tree/edit.js b/plugins/node_modules/ace_tree/lib/ace_tree/edit.js
diff --git a/plugins/node_modules/architect-build/transform.js b/plugins/node_modules/architect-build/transform.js