fix bug where decorations were not being cleared properly

neo4j · Jan 19, 2023 · b5add94 · b5add94
1 parent 05bcaef
commit b5add94
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.changeset/lovely-plants-poke.md b/.changeset/lovely-plants-poke.md
@@ -0,0 +1,5 @@
+---
+"@neo4j-cypher/codemirror": patch
+---
+
+fix bug where decorations were not being cleared properly
diff --git a/packages/codemirror/src/cypher-extensions.js b/packages/codemirror/src/cypher-extensions.js
@@ -86,11 +86,12 @@ const typeMarkerFromTo = (view, options = {}) => {
 };
 
 export const resetColors = (view, editorSupport) => {
-  view.dispatch(clearTypeMarkersEffect.of());
+  const effects = [clearTypeMarkersEffect.of()];
+  view.dispatch({ effects });
 };
 
 export const fixColors = (view, editorSupport) => {
-  view.dispatch(clearTypeMarkersEffect.of());
+  resetColors(view, editorSupport);
   if (editorSupport.parseTree == null) {
     return;
   }

diff --git a/packages/codemirror/src/cypher-state-definitions.js b/packages/codemirror/src/cypher-state-definitions.js
@@ -42,7 +42,7 @@ export const typeMarkerField = StateField.define({
     typeMarkers = typeMarkers.map(tr.changes);
     for (let e of tr.effects) {
       if (e.is(clearTypeMarkersEffect)) {
-        typeMarkers = typeMarkers.filter(() => false);
+        typeMarkers = Decoration.none;
       } else if (e.is(addTypeMarkerEffect)) {
         if (e.value.from !== e.value.to) {
           typeMarkers = typeMarkers.update({