Merge pull request ajaxorg#3644 from ajaxorg/fix-wrapped-line-rendering

Fix wrapped line rendering

Author: nightwing

lib/ace/autocomplete/popup.js

@@ -50,7 +50,7 @@ var $singleLineEditor = function(el) {
     editor.renderer.setShowGutter(false);
     editor.renderer.setHighlightGutterLine(false);
 
-    editor.$mouseHandler.$focusWaitTimout = 0;
+    editor.$mouseHandler.$focusTimeout = 0;
     editor.$highlightTagPending = true;
 
     return editor;

lib/ace/keyboard/vim.js

@@ -6037,7 +6037,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
     var name = '';
     if (e.ctrlKey) { name += 'C-'; }
     if (e.altKey) { name += 'A-'; }
-    if (e.shiftKey) { name += 'S-'; }
+    if ((name || key.length > 1) && e.shiftKey) { name += 'S-'; }
 
     name += key;
     if (name.length > 1) { name = '<' + name + '>'; }

lib/ace/layer/text.js

@@ -195,6 +195,7 @@ var Text = function(parentEl) {
             lineElementsIdx ++;
         }
 
+        var heightChanged = false;
         var row = first;
         var foldLine = this.session.getNextFoldLine(row);
         var foldStart = foldLine ? foldLine.start.row : Infinity;
@@ -214,10 +215,20 @@ var Text = function(parentEl) {
                 this.$renderLine(
                     lineElement, row, row == foldStart ? foldLine : false
                 );
-                lineElement.style.height = (config.lineHeight * this.session.getRowLength(row)) + "px";
+                var height = (config.lineHeight * this.session.getRowLength(row)) + "px";
+                if (lineElement.style.height != height) {
+                    heightChanged = true;
+                    lineElement.style.height = height;
+                }
             }
             row++;
         }
+        if (heightChanged) {
+            while (lineElementsIdx < this.$lines.cells.length) {
+                var cell = this.$lines.cells[lineElementsIdx++];
+                cell.element.style.top = this.$lines.computeLineTop(cell.row, config, this.session) + "px";
+            }
+        }
     };
 
     this.scrollLines = function(config) {

lib/ace/virtual_renderer.js

@@ -864,7 +864,7 @@ var VirtualRenderer = function(container, theme) {
                 this.$textLayer.scrollLines(config);
 
             if (this.$showGutter) {
-                if (changes & this.CHANGE_GUTTER)
+                if (changes & this.CHANGE_GUTTER || changes & this.CHANGE_LINES)
                     this.$gutterLayer.update(config);
                 else
                     this.$gutterLayer.scrollLines(config);