Make Xtext CodeMirror more robust

2 files changed, 3 insertions, 1 deletions

diff --git a/language-web/src/main/js/editor/EditorButtons.jsx b/language-web/src/main/js/editor/EditorButtons.jsx
index f67afdbf..18139bd4 100644
--- a/language-web/src/main/js/editor/EditorButtons.jsx
+++ b/language-web/src/main/js/editor/EditorButtons.jsx
@@ -62,6 +62,7 @@ export default observer(() => {
         size='small'
         className={classes.iconButton}
         aria-label='Show line numbers'
+        value='show-line-numbers'
       >
         <FormatListNumberedIcon fontSize='small'/>
       </ToggleButton>
diff --git a/language-web/src/main/js/xtext/xtext-codemirror.js b/language-web/src/main/js/xtext/xtext-codemirror.js
index 4d50718c..d246172a 100644
--- a/language-web/src/main/js/xtext/xtext-codemirror.js
+++ b/language-web/src/main/js/xtext/xtext-codemirror.js
@@ -279,6 +279,7 @@ define([
                                                         }
                                                 };
                                                 }),
+            from: cursor,
                                                 to: cursor
                                         };
                                 }});
@@ -329,10 +330,10 @@ define([
         
         CodeMirrorServiceBuilder.prototype._clearAnnotations = function(annotations) {
                 var editor = this.editor;
+    editor.clearGutter('annotations-gutter');
                 for (var i = 0; i < annotations.length; i++) {
                         var annotation = annotations[i];
                         if (annotation) {
-                                editor.setGutterMarker(i, 'annotations-gutter', null);
                                 annotations[i] = undefined;
                         }
                 }