Fix: starting with CodeMirror/view 6.39, remove old patch.

Author: bjones1

builder/src/main.rs

@@ -311,15 +311,6 @@ fn patch_file(patch: &str, before_patch: &str, file_path: &str) -> io::Result<()
 }
 /// After updating files in the client's Node files, perform some fix-ups.
 fn patch_client_libs() -> io::Result<()> {
-    // Apply a the fixes described in [issue
-    // 27](https://github.com/bjones1/CodeChat_Editor/issues/27).
-    patch_file(
-        "
-        selectionNotFocus = this.view.state.facet(editable) ? focused : hasSelection(this.dom, this.view.observer.selectionRange)",
-        "        let selectionNotFocus = !focused && !(this.view.state.facet(editable) || this.dom.tabIndex > -1) &&
-            hasSelection(this.dom, this.view.observer.selectionRange) && !(activeElt && this.dom.contains(activeElt));",
-        &format!("{CLIENT_PATH}/node_modules/@codemirror/view/dist/index.js")
-    )?;
     // In [older
     // releases](https://www.tiny.cloud/docs/tinymce/5/6.0-upcoming-changes/#options),
     // TinyMCE allowed users to change `whitespace_elements`; the whitespace

client/package.json5

@@ -44,11 +44,6 @@
     },
     type: 'module',
     version: '0.1.45',
-    pnpm: {
-        overrides: {
-            '@codemirror/view': '<6.39.0',
-        },
-    },
     dependencies: {
         '@codemirror/commands': '^6.10.0',
         '@codemirror/lang-cpp': '^6.0.3',
@@ -66,7 +61,7 @@
         '@codemirror/lang-xml': '^6.1.0',
         '@codemirror/lang-yaml': '^6.1.2',
         '@codemirror/state': '^6.5.2',
-        '@codemirror/view': '^6.38.8',
+        '@codemirror/view': '^6.39.3',
         '@hpcc-js/wasm-graphviz': '^1.17.0',
         '@mathjax/mathjax-newcm-font': '4.0.0',
         codemirror: '^6.0.2',

client/pnpm-lock.yaml

@@ -76,24 +76,37 @@ use code_chat_editor::{
 // Not all messages produced by the server are ordered. To accommodate
 // out-of-order messages, this class provides a way to `insert` expected
 // messages, then wait until they're all be received (`assert_all_messages`).
-pub struct ExpectedMessages(HashMap<i64, EditorMessageContents>);
+pub struct ExpectedMessages(HashMap<i64, (EditorMessageContents, bool)>);
 
 impl ExpectedMessages {
     pub fn new() -> ExpectedMessages {
         ExpectedMessages(HashMap::new())
     }
 
-    pub fn insert(&mut self, editor_message: EditorMessage) {
+    pub fn insert(&mut self, editor_message: EditorMessage, is_dynamic: bool) {
         assert!(
             self.0
-                .insert(editor_message.id as i64, editor_message.message)
+                .insert(
+                    editor_message.id as i64,
+                    (editor_message.message, is_dynamic)
+                )
                 .is_none()
         );
     }
 
     pub fn check(&mut self, editor_message: EditorMessage) {
-        if let Some(editor_message_contents) = self.0.remove(&(editor_message.id as i64)) {
-            assert_eq!(editor_message.message, editor_message_contents);
+        if let Some((ref mut editor_message_contents, is_dynamic)) =
+            self.0.remove(&(editor_message.id as i64))
+        {
+            if is_dynamic
+                && let EditorMessageContents::Update(emc) = editor_message_contents
+                && let Some(contents) = &mut emc.contents
+            {
+                let version = get_version(&editor_message);
+                contents.version = version;
+            }
+            // Special case:
+            assert_eq!(&editor_message.message, editor_message_contents);
         } else {
             panic!(
                 "Message not found: looked for \n{:#?}\nin:\n{:#?}",
@@ -112,7 +125,14 @@ impl ExpectedMessages {
         timeout: Duration,
     ) {
         while !self.0.is_empty() {
-            self.check(codechat_server.get_message_timeout(timeout).await.unwrap());
+            if let Some(editor_message) = codechat_server.get_message_timeout(timeout).await {
+                self.check(editor_message);
+            } else {
+                panic!(
+                    "No matching messages found. Unmatched messages:\n{:#?}",
+                    self.0
+                );
+            }
         }
     }
 }
@@ -328,14 +348,20 @@ pub async fn perform_loadfile(
         .unwrap();
     // The ordering of these messages isn't fixed -- one can come first, or the
     // other.
-    expected_messages.insert(EditorMessage {
-        id: current_file_id,
-        message: EditorMessageContents::Result(Ok(ResultOkTypes::Void)),
-    });
-    expected_messages.insert(EditorMessage {
-        id: server_id,
-        message: EditorMessageContents::LoadFile(path.clone()),
-    });
+    expected_messages.insert(
+        EditorMessage {
+            id: current_file_id,
+            message: EditorMessageContents::Result(Ok(ResultOkTypes::Void)),
+        },
+        false,
+    );
+    expected_messages.insert(
+        EditorMessage {
+            id: server_id,
+            message: EditorMessageContents::LoadFile(path.clone()),
+        },
+        false,
+    );
     expected_messages
         .assert_all_messages(codechat_server, TIMEOUT)
         .await;
@@ -402,8 +428,8 @@ pub async fn get_empty_client_update(
     client_id: &mut f64,
     client_version: &mut f64,
     mode: &str,
-    cursor_position: u32,
-    scroll_position: f32,
+    cursor_position: Option<u32>,
+    scroll_position: Option<f32>,
 ) {
     let msg = codechat_server.get_message_timeout(TIMEOUT).await.unwrap();
     let version = *client_version;
@@ -425,8 +451,8 @@ pub async fn get_empty_client_update(
                     }),
                     version: *client_version
                 }),
-                cursor_position: Some(cursor_position),
-                scroll_position: Some(scroll_position)
+                cursor_position,
+                scroll_position
             })
         }
     );

server/tests/overall_common/mod.rs

@@ -437,14 +437,20 @@ async fn test_server_core(
         .await
         .unwrap();
 
-    expected_messages.insert(EditorMessage {
-        id: current_file_id,
-        message: EditorMessageContents::Result(Ok(ResultOkTypes::Void)),
-    });
-    expected_messages.insert(EditorMessage {
-        id: server_id,
-        message: EditorMessageContents::LoadFile(txt_path.clone()),
-    });
+    expected_messages.insert(
+        EditorMessage {
+            id: current_file_id,
+            message: EditorMessageContents::Result(Ok(ResultOkTypes::Void)),
+        },
+        false,
+    );
+    expected_messages.insert(
+        EditorMessage {
+            id: server_id,
+            message: EditorMessageContents::LoadFile(txt_path.clone()),
+        },
+        false,
+    );
     expected_messages
         .assert_all_messages(&codechat_server, TIMEOUT)
         .await;
@@ -943,8 +949,8 @@ async fn test_4_core(
         &mut client_id,
         &mut client_version,
         "python",
-        3,
-        1.0,
+        Some(3),
+        Some(1.0),
     )
     .await;
 
@@ -955,8 +961,8 @@ async fn test_4_core(
         &mut client_id,
         &mut client_version,
         "python",
-        5,
-        1.0,
+        Some(5),
+        Some(1.0),
     )
     .await;
 
@@ -1114,7 +1120,7 @@ async fn test_5_core(
                         doc: vec![StringDiff {
                             from: 0,
                             to: Some(8),
-                            insert: "# Tesbart.\n".to_string(),
+                            insert: "# foobarTest.\n".to_string(),
                         },],
                         doc_blocks: vec![],
                         version,