From 59e0c7862ae8e68b8650fb8dff996a36212ee416 Mon Sep 17 00:00:00 2001 From: Petar Dimov Date: Mon, 3 Jun 2024 14:31:06 +0300 Subject: [PATCH 1/2] replace innerHTML in showErrorMarker --- src/ext/error_marker.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ext/error_marker.js b/src/ext/error_marker.js index cd5052ddc0..753bc4b1d4 100644 --- a/src/ext/error_marker.js +++ b/src/ext/error_marker.js @@ -122,7 +122,12 @@ exports.showErrorMarker = function(editor, dir) { w.el.className = "error_widget_wrapper"; el.className = "error_widget " + gutterAnno.className; - el.innerHTML = gutterAnno.text.join("
"); + gutterAnno.text.forEach(function (annoTextLine, i) { + el.appendChild(dom.createTextNode(annoTextLine)); + if (i < gutterAnno.text.length - 1) { + el.appendChild(dom.createElement("br")); + } + }); el.appendChild(dom.createElement("div")); From d23582ecc79715fd65b96dde01b65aca17d34a16 Mon Sep 17 00:00:00 2001 From: Petar Dimov Date: Wed, 3 Jul 2024 09:55:54 +0300 Subject: [PATCH 2/2] use displayText to avoid double escaping --- src/ext/error_marker.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ext/error_marker.js b/src/ext/error_marker.js index 753bc4b1d4..1c4bc5aa7e 100644 --- a/src/ext/error_marker.js +++ b/src/ext/error_marker.js @@ -98,7 +98,7 @@ exports.showErrorMarker = function(editor, dir) { return; } else { gutterAnno = { - text: [nls("error-marker.good-state", "Looks good!")], + displayText: [nls("error-marker.good-state", "Looks good!")], className: "ace_ok" }; } @@ -122,9 +122,9 @@ exports.showErrorMarker = function(editor, dir) { w.el.className = "error_widget_wrapper"; el.className = "error_widget " + gutterAnno.className; - gutterAnno.text.forEach(function (annoTextLine, i) { + gutterAnno.displayText.forEach(function (annoTextLine, i) { el.appendChild(dom.createTextNode(annoTextLine)); - if (i < gutterAnno.text.length - 1) { + if (i < gutterAnno.displayText.length - 1) { el.appendChild(dom.createElement("br")); } });