feat: Add support for multiple files

Author: Brayan-724

backend/src/ws/handlers.rs

@@ -126,6 +126,16 @@ impl RgWebsocket {
                     Err(ServerMessageError::None)
                 }
             }
+            InternalMessage::FileCreate { path, doc } => {
+                self.sync_docs.insert(path, (doc, 0));
+
+                Err(ServerMessageError::None)
+            }
+            InternalMessage::FileDelete { path } => {
+                self.sync_docs.remove(&path);
+
+                Err(ServerMessageError::None)
+            }
         }
     }
 
@@ -239,7 +249,12 @@ impl RgWebsocket {
                 let project = self.app_state.get_project(self.project_id).await?;
                 let mut project = project.write().await;
 
-                project.add_file(file, Document::new());
+                let new_doc = project.add_file(file.clone(), Document::new());
+
+                _ = project.internal.send(InternalMessage::FileCreate {
+                    path: file,
+                    doc: new_doc,
+                });
 
                 let msg = ServerMessage::ProjectFiles {
                     files: project.get_files().await,
@@ -260,6 +275,10 @@ impl RgWebsocket {
                         files: project.get_files().await,
                     };
 
+                    _ = project
+                        .internal
+                        .send(InternalMessage::FileDelete { path: file });
+
                     _ = project.broadcast.send(msg);
 
                     Err(ServerMessageError::None)

backend/src/ws/messages.rs

@@ -1,10 +1,11 @@
 use std::collections::HashMap;
+use std::sync::Arc;
 
 use operational_transform::OperationSeq;
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;
 
-use crate::collab::{DocumentInfo, UserOperation};
+use crate::collab::{Document, DocumentInfo, UserOperation};
 use crate::project::AccessLevel;
 use crate::utils::ArcStr;
 
@@ -115,4 +116,6 @@ impl From<ServerMessageError> for ServerMessage {
 #[derive(Clone)]
 pub enum InternalMessage {
     FileEdit { path: ArcStr },
+    FileCreate { path: ArcStr, doc: Arc<Document> },
+    FileDelete { path: ArcStr },
 }

frontend/src/features/editor/services/editor.ts

@@ -36,7 +36,7 @@ export function startReceivingSync() {
 
     let content = unwrap(syncFiles)[msg.file];
 
-    if (content) {
+    if (content != null) {
       content = msg.actions.reduce(
         (content, action) =>
           applyOperationToString(

frontend/src/features/editor/utils/syncExtension.ts

@@ -19,12 +19,7 @@ import {
   setSyncFiles,
 } from "../stores";
 import { unicodeLength } from "./unicodeLength";
-import {
-  applyOperationToView,
-  syncAnnotation,
-  syncAnnotationType,
-} from "./applyOperation";
-import { batch } from "solid-js";
+import { applyOperationToView, syncAnnotationType } from "./applyOperation";
 
 let outstanding: OpSeq | null = null;
 let accumulated_changes: OpSeq | null = null;
@@ -122,8 +117,6 @@ function anyEventHandler(file: FileNode) {
       file: file.fullPath,
       cursors: cursors.map(Cursor.into_rscursor),
     });
-
-    console.log("CURSORS", cursors);
   };
 
   const handleOps = (update: ViewUpdate) => {
@@ -181,7 +174,7 @@ function anyEventHandler(file: FileNode) {
       return;
     }
 
-    if (update.docChanged && update.changes.length) {
+    if (update.docChanged) {
       handleOps(update);
     }
 

frontend/src/features/editor/views/CodeEditor.tsx

@@ -108,25 +108,7 @@ export function CodeEditor(props: CodeEditorProps) {
       extensions={[
         ...rustExtensions(styles),
         readOnly.of([]),
-        cursors.of(EditorView.decorations.of(Decoration.set(
-          [
-            Decoration.mark({
-              inclusive: true,
-              attributes: {
-                style: "--hue: 140",
-              },
-              class: styles.colored_selection,
-            }).range(0, 10),
-
-            Decoration.mark({
-              inclusive: true,
-              attributes: {
-                style: "--hue: 240",
-              },
-              class: styles.colored_cursor,
-            }).range(15, 15 + 1),
-          ],
-        ))),
+        cursors.of(EditorView.decorations.of(Decoration.set([]))),
         syncExtension(file.data),
       ]}
       onEditorMount={(editor) => {