From 9ec6ce7b5a09d16f8bdb19e8140d7cae534f2ecb Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Fri, 20 Aug 2021 19:33:39 +0200 Subject: Make Xtext CodeMirror more robust --- language-web/src/main/js/editor/EditorButtons.jsx | 1 + language-web/src/main/js/xtext/xtext-codemirror.js | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'language-web') 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' > 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; } } -- cgit v1.2.3-70-g09d2