From 59ec87a3939cedf77b263b4ca3910a1e6e8b1a39 Mon Sep 17 00:00:00 2001 From: Steve-Mcl Date: Fri, 26 May 2023 10:12:48 +0100 Subject: [PATCH] fix function node error badge not shown fixes #4194 --- .../src/js/ui/editors/code-editors/monaco.js | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/code-editors/monaco.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/code-editors/monaco.js index e0bd94c8b..b18e01fbb 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/code-editors/monaco.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/code-editors/monaco.js @@ -1168,19 +1168,19 @@ RED.editor.codeEditor.monaco = (function() { // Warning: 4 // Error: 8 ed.getAnnotations = function getAnnotations() { - var aceCompatibleMarkers = []; + let aceCompatibleMarkers; try { - var _model = ed.getModel(); + const _model = ed.getModel(); if (_model !== null) { - var id = _model._languageId; // e.g. javascript - var ra = _model._associatedResource.authority; //e.g. model - var rp = _model._associatedResource.path; //e.g. /18 - var rs = _model._associatedResource.scheme; //e.g. inmemory - var modelMarkers = monaco.editor.getModelMarkers(_model) || []; - var thisEditorsMarkers = modelMarkers.filter(function (marker) { - var _ra = marker.resource.authority; //e.g. model - var _rp = marker.resource.path; //e.g. /18 - var _rs = marker.resource.scheme; //e.g. inmemory + const id = _model.getLanguageId(); // e.g. javascript + const ra = _model.uri.authority; // e.g. model + const rp = _model.uri.path; // e.g. /18 + const rs = _model.uri.scheme; // e.g. inmemory + const modelMarkers = monaco.editor.getModelMarkers(_model) || []; + const thisEditorsMarkers = modelMarkers.filter(function (marker) { + const _ra = marker.resource.authority; // e.g. model + const _rp = marker.resource.path; // e.g. /18 + const _rs = marker.resource.scheme; // e.g. inmemory return marker.owner == id && _ra === ra && _rp === rp && _rs === rs; }) aceCompatibleMarkers = thisEditorsMarkers.map(function (marker) {