Fix: Correct usage for update/delete ranges.

Author: bjones1

client/src/CodeMirror-integration.mts

@@ -194,22 +194,32 @@ export const docBlockField = StateField.define<DecorationSet>({
                     effect.value.from,
                     effect.value.from,
                     (from, to_found, value) => {
-                        // For the given `from`, there should be exactly one doc
-                        // block.
-                        assert(prev === undefined);
-                        assert(
-                            effect.value.from === from,
-                            `${effect.value.from} !== ${from}`,
-                        );
-                        prev = value;
-                        to = to_found;
+                        // Only look for blocks whose from is as specified. `between` will also return blocks whose to matches -- for example, given from = 1, one doc block of [0, 1], and another of [1, 2], *both* will be found; we want only the [1, 2] doc block.
+                        if (effect.value.from === from) {
+                            // For the given `from`, there should be exactly one doc
+                            // block.
+                            if (prev !== undefined) {
+                                console.error({ doc_blocks, effect });
+                                assert(
+                                    false,
+                                    "More than one doc block at one location found.",
+                                );
+                            }
+                            prev = value;
+                            to = to_found;
+
+                            // We could return `false` here to stop the search for efficiency. However, we let it continue in case there are two doc blocks with the same `from` value, so we can at least flag this error.
+                        }
                     },
                 );
-                assert(prev !== undefined);
+                if (prev === undefined) {
+                    console.error({ doc_blocks, effect });
+                    assert(false, "No doc block found.");
+                }
                 doc_blocks = doc_blocks.update({
                     // Remove the old doc block. We assume there's only one
                     // block in the provided from/to range.
-                    filter: (from, to, value) => false,
+                    filter: (from, to, value) => from !== effect.value.from,
                     filterFrom: effect.value.from,
                     filterTo: effect.value.from,
                     // This adds the replacement doc block with updated
@@ -236,9 +246,9 @@ export const docBlockField = StateField.define<DecorationSet>({
                 });
             } else if (effect.is(deleteDocBlock)) {
                 doc_blocks = doc_blocks.update({
-                    filter: (from, to, value) => false,
+                    filter: (from, to, value) => from !== effect.value.from,
                     filterFrom: effect.value.from,
-                    filterTo: effect.value.to,
+                    filterTo: effect.value.from,
                 });
             }
         return doc_blocks;
@@ -353,12 +363,11 @@ export const updateDocBlock = StateEffect.define<updateDocBlockType>({
 });
 
 // Delete a doc block.
-export const deleteDocBlock = StateEffect.define<{ from: number; to: number }>({
+export const deleteDocBlock = StateEffect.define<{ from: number }>({
     // Returning undefined deletes the block per the
     // [docs](https://codemirror.net/docs/ref/#state.StateEffect^define^spec.map).
-    map: ({ from, to }, change: ChangeDesc) => ({
+    map: ({ from }, change: ChangeDesc) => ({
         from: change.mapPos(from),
-        to: change.mapPos(to),
     }),
 });
 

server/src/lexer/tests.rs

@@ -22,6 +22,7 @@ use super::supported_languages::get_language_lexer_vec;
 use super::{CodeDocBlock, DocBlock, compile_lexers, source_lexer};
 use crate::test_utils::stringit;
 use indoc::indoc;
+use pretty_assertions::assert_eq;
 
 // Utilities
 // ---------

server/src/processing.rs

@@ -167,7 +167,6 @@ pub struct CodeMirrorDocBlockUpdate {
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq, TS)]
 pub struct CodeMirrorDocBlockDelete {
     pub from: usize,
-    pub to: usize,
 }
 
 /// Store the difference between a previous and current string; this is based on
@@ -1014,7 +1013,6 @@ pub fn diff_code_mirror_doc_blocks(
             change_spec.push(CodeMirrorDocBlockTransaction::Delete(
                 CodeMirrorDocBlockDelete {
                     from: before[before_index as usize].from,
-                    to: before[hunk.before.end as usize - 1].to,
                 },
             ));
         }

server/src/processing/tests.rs

@@ -1055,7 +1055,7 @@ fn test_diff_2() {
     assert_eq!(
         ret,
         vec![CodeMirrorDocBlockTransaction::Delete(
-            CodeMirrorDocBlockDelete { from: 10, to: 11 }
+            CodeMirrorDocBlockDelete { from: 10 }
         )]
     );
 
@@ -1073,7 +1073,7 @@ fn test_diff_2() {
     assert_eq!(
         ret,
         vec![CodeMirrorDocBlockTransaction::Delete(
-            CodeMirrorDocBlockDelete { from: 11, to: 12 }
+            CodeMirrorDocBlockDelete { from: 11 }
         )]
     );
 
@@ -1087,7 +1087,7 @@ fn test_diff_2() {
     assert_eq!(
         ret,
         vec![CodeMirrorDocBlockTransaction::Delete(
-            CodeMirrorDocBlockDelete { from: 11, to: 12 }
+            CodeMirrorDocBlockDelete { from: 11 }
         )]
     );
 }