Merge branch 'next' into feature/prepareFinalNext-CMEM-6943

Author: haschek

CHANGELOG.md

@@ -77,6 +77,8 @@ This is a major release, and it might be not compatible with your current usage
 
 -   `<Modal />`:
     -   Add 'nopan', 'nowheel' and 'nodrag' classes to Modal's overlay classes in order to always prevent react-flow to react to drag and pan actions in modals.
+-   `<CodeAutocompleteField />`:
+    -   In multiline mode, validation errors might be highlighted incorrectly (relative line offset added).
 
 ### Changed
 

src/components/AutoSuggestion/AutoSuggestion.tsx

@@ -302,12 +302,11 @@ export const CodeAutocompleteField = ({
             };
             if (parseError) {
                 const { message, start, end } = parseError;
-                const { toOffset, fromOffset } = getOffsetRange(cm, start, end);
                 clearCurrentErrorMarker();
                 const { from, to } = markText({
                     view: cm,
-                    from: fromOffset,
-                    to: toOffset,
+                    from: start,
+                    to: end,
                     className: `${eccgui}-autosuggestion__text--highlighted-error`,
                     title: message,
                 });

src/extensions/react-flow/edges/EdgeDefaultV12.tsx

@@ -104,7 +104,7 @@ export const EdgeDefaultV12 = memo(
                               : undefined,
                       markerEnd:
                           arrowDirection === "normal" || arrowDirection === "bidirectional"
-                              ? `url(#react-flow__marker--${appearance}${intent ? `-${intent}` : "-none"}`
+                              ? `url(#react-flow__marker--${appearance}${intent ? `-${intent}` : "-none"})`
                               : undefined,
                   }
                 : {};