Fix #2460 and #2355 using technique from #2282

Author: Adam Ahmed

lib/codemirror.js

@@ -4339,6 +4339,7 @@ window.CodeMirror = (function() {
     if (!ws.length) this.line.widgets = null;
     var aboveVisible = heightAtLine(this.cm, this.line) < this.cm.doc.scrollTop;
     updateLineHeight(this.line, Math.max(0, this.line.height - widgetHeight(this)));
+    this.cm.curOp.forceUpdate = true;
     if (aboveVisible) addToScrollPos(this.cm, 0, -this.height);
     regChange(this.cm, no, no + 1);
   });
@@ -4348,6 +4349,7 @@ window.CodeMirror = (function() {
     var diff = widgetHeight(this) - oldH;
     if (!diff) return;
     updateLineHeight(this.line, this.line.height + diff);
+    this.cm.curOp.forceUpdate = true;
     var no = lineNo(this.line);
     regChange(this.cm, no, no + 1);
   });