From 116cd204414ba27b70a24f1ed358ad2f84bbd6c6 Mon Sep 17 00:00:00 2001
From: Ishaan Dey <ishaan1013@gmail.com>
Date: Wed, 8 May 2024 01:04:03 -0700
Subject: [PATCH] switch disposing logic (not working)

---
 frontend/components/editor/index.tsx          | 35 ++++++++++++-------
 frontend/components/editor/terminal/index.tsx | 19 ++++++----
 2 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/frontend/components/editor/index.tsx b/frontend/components/editor/index.tsx
index a55f291..33ec58f 100644
--- a/frontend/components/editor/index.tsx
+++ b/frontend/components/editor/index.tsx
@@ -77,6 +77,7 @@ export default function CodeEditor({
   >([]);
   const [activeTerminalId, setActiveTerminalId] = useState("");
   const [creatingTerminal, setCreatingTerminal] = useState(false);
+  const [closingTerminal, setClosingTerminal] = useState("");
   const [provider, setProvider] = useState<TypedLiveblocksProvider>();
   const [ai, setAi] = useState(false);
   const [disableAccess, setDisableAccess] = useState({
@@ -350,8 +351,13 @@ export default function CodeEditor({
 
     return () => {
       socket.disconnect();
-
       resizeObserver.disconnect();
+
+      terminals.forEach((term) => {
+        if (term.terminal) {
+          term.terminal.dispose();
+        }
+      });
     };
   }, []);
 
@@ -375,14 +381,10 @@ export default function CodeEditor({
     };
 
     const onTerminalResponse = (response: { id: string; data: string }) => {
-      console.log("terminal response:", response);
-      // console.log("activeId:", activeTerminalId);
-
-      // const term = terminals.find((t) => t.id === response.id);
-      // if (term && term.terminal) {
-      //   console.log("writing to terminal, id:", response.id);
-      //   term.terminal.write(response.data);
-      // }
+      const term = terminals.find((t) => t.id === response.id);
+      if (term && term.terminal) {
+        term.terminal.write(response.data);
+      }
     };
 
     const onDisableAccess = (message: string) => {
@@ -407,7 +409,8 @@ export default function CodeEditor({
       socket.off("terminalResponse", onTerminalResponse);
       socket.off("disableAccess", onDisableAccess);
     };
-  }, []);
+    // }, []);
+  }, [terminals]);
 
   // Helper functions:
 
@@ -415,10 +418,12 @@ export default function CodeEditor({
     setCreatingTerminal(true);
     const id = createId();
     console.log("creating terminal, id:", id);
+
+    setTerminals((prev) => [...prev, { id, terminal: null }]);
+    setActiveTerminalId(id);
+
     setTimeout(() => {
       socket.emit("createTerminal", id, () => {
-        setTerminals((prev) => [...prev, { id, terminal: null }]);
-        setActiveTerminalId(id);
         setCreatingTerminal(false);
       });
     }, 1000);
@@ -475,7 +480,11 @@ export default function CodeEditor({
     const index = terminals.findIndex((t) => t.id === term.id);
     if (index === -1) return;
 
+    setClosingTerminal(term.id);
+
     socket.emit("closeTerminal", term.id, () => {
+      setClosingTerminal("");
+
       const nextId =
         activeTerminalId === term.id
           ? numTerminals === 1
@@ -485,6 +494,8 @@ export default function CodeEditor({
             : terminals[index - 1].id
           : activeTerminalId;
 
+      if (activeTerminal && activeTerminal.terminal)
+        activeTerminal.terminal.dispose();
       setTerminals((prev) => prev.filter((t) => t.id !== term.id));
 
       if (!nextId) {
diff --git a/frontend/components/editor/terminal/index.tsx b/frontend/components/editor/terminal/index.tsx
index 030fc83..f912dfd 100644
--- a/frontend/components/editor/terminal/index.tsx
+++ b/frontend/components/editor/terminal/index.tsx
@@ -23,6 +23,9 @@ export default function EditorTerminal({
 
   useEffect(() => {
     if (!terminalRef.current) return;
+    console.log("new terminal", id, term ? "reusing" : "creating");
+
+    if (term) return;
 
     const terminal = new Terminal({
       cursorBlink: true,
@@ -31,32 +34,34 @@ export default function EditorTerminal({
       },
       fontFamily: "var(--font-geist-mono)",
       fontSize: 14,
+      lineHeight: 1.5,
+      letterSpacing: 0,
     });
 
     setTerm(terminal);
 
-    return () => {
-      if (terminal) terminal.dispose();
-    };
-  }, []);
+    // return () => {
+    //   if (terminal) terminal.dispose();
+    // };
+  }, [id]);
 
   useEffect(() => {
     if (!term) return;
 
+    console.log("A");
     if (terminalRef.current) {
       const fitAddon = new FitAddon();
       term.loadAddon(fitAddon);
       term.open(terminalRef.current);
+      console.log("B");
       fitAddon.fit();
-      setTerm(term);
+      // setTerm(term);
     }
     const disposable = term.onData((data) => {
       console.log("terminalData", id, data);
       socket.emit("terminalData", id, data);
     });
 
-    // socket.emit("terminalData", "\n");
-
     return () => {
       disposable.dispose();
     };