Merge branch 'main' into xcode26

Author: nab138

bun.lock

@@ -16,7 +16,7 @@ serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 tauri-plugin-shell = "2.3.0"
 tauri-plugin-fs = { version = "2.4.2", features= ["watch"] }
-tauri-plugin-dialog = "2.3.3"
+tauri-plugin-dialog = "2.4.0"
 tauri-plugin-store = "2.4.0"
 tauri-plugin-opener = "2.5.0"
 tauri-plugin-os = "2.3.1"

src-tauri/Cargo.lock

@@ -5,6 +5,7 @@ import Convert from "ansi-to-html";
 import { Virtuoso } from "react-virtuoso";
 import { useIDE } from "../../utilities/IDEContext";
 import { escapeHtml } from "./Console";
+import { useParams } from "react-router";
 
 const convert = new Convert();
 
@@ -13,6 +14,12 @@ export default function CommandConsole() {
   const listenerAdded = useRef(false);
   const unlisten = useRef<() => void>(() => {});
 
+  const { path } = useParams<"path">();
+
+  useEffect(() => {
+    setConsoleLines([]);
+  }, [path]);
+
   useEffect(() => {
     if (!listenerAdded.current) {
       (async () => {

src-tauri/Cargo.toml

@@ -3,6 +3,7 @@ import "./Console.css";
 import { listen } from "@tauri-apps/api/event";
 import Convert from "ansi-to-html";
 import { Virtuoso } from "react-virtuoso";
+import { useParams } from "react-router";
 
 const convert = new Convert();
 
@@ -25,6 +26,11 @@ export default function Console({
   const [consoleLines, setConsoleLines] = useState<string[]>([]);
   const listenerAdded = useRef(false);
   const unlisten = useRef<() => void>(() => {});
+  const { path } = useParams<"path">();
+
+  useEffect(() => {
+    setConsoleLines([]);
+  }, [path]);
 
   useEffect(() => {
     if (!listenerAdded.current) {

src/components/Tiles/CommandConsole.tsx

@@ -17,12 +17,14 @@
   padding-bottom: 1px;
   position: relative;
   width: 100%;
+  overflow-x: hidden;
 }
 
 .tab-wrapper {
   display: flex;
   align-items: center;
   position: relative;
+  flex-shrink: 0;
 }
 
 .tabsContainer .Mui-selected::after {

src/components/Tiles/Console.tsx

@@ -15,6 +15,9 @@ import "@codingame/monaco-vscode-swift-default-extension";
 import "@codingame/monaco-vscode-theme-defaults-default-extension";
 import { platform } from "@tauri-apps/plugin-os";
 import { TabLike } from "../TabLike";
+import { useStore } from "../../utilities/StoreContext";
+import { useParams } from "react-router";
+import { readTextFile, writeTextFile } from "@tauri-apps/plugin-fs";
 
 export type WorkerLoader = () => Worker;
 const workerLoaders: Partial<Record<string, WorkerLoader>> = {
@@ -47,7 +50,7 @@ export interface EditorProps {
   openFiles: string[];
   setOpenFiles: Dispatch<SetStateAction<string[]>>;
   focusedFile: string | null;
-  setSaveFile: Dispatch<SetStateAction<(() => void) | null>>;
+  setSaveFile: Dispatch<SetStateAction<(() => Promise<void>) | null>>;
   setUndo: Dispatch<SetStateAction<(() => void) | null>>;
   setRedo: Dispatch<SetStateAction<(() => void) | null>>;
   openNewFile: (file: string) => void;
@@ -101,8 +104,69 @@ export default ({
   const openNewFileRef = useRef(openNewFile);
   const selectionOverrideRef = useRef<ITextEditorOptions | null>(null);
   const hasInitializedRef = useRef(false);
+  const scrollStates = useRef<{
+    [key: string]: [number, number];
+  }>({});
+  const [hoveredOnBtn, setHoveredOnBtn] = useState<number | null>(null);
+  const [formatOnSave] = useStore<boolean>("sourcekit/format", true);
 
-  let [hoveredOnBtn, setHoveredOnBtn] = useState<number | null>(null);
+  const { path: filePath } = useParams<"path">();
+  const hasAttemptedToReadOpenFiles = useRef<string | null>(null);
+
+  useEffect(() => {
+    (async () => {
+      if (!filePath || hasAttemptedToReadOpenFiles.current === filePath) return;
+      const savePath = await path.join(
+        filePath,
+        ".crosscode",
+        "openFiles.json"
+      );
+      try {
+        let text = await readTextFile(savePath);
+        if (!text) return;
+        let data = JSON.parse(text) as { files: string[]; focused: number };
+        // make sure that types are as expected
+        if (
+          !data ||
+          typeof data !== "object" ||
+          !Array.isArray(data.files) ||
+          typeof data.focused !== "number"
+        )
+          return;
+        data.files = data.files.filter((file) => typeof file === "string");
+        if (data.files.length === 0) return;
+        if (data.focused < 0 || data.focused >= data.files.length) {
+          data.focused = 0;
+        }
+        setOpenFiles(data.files);
+        setTimeout(() => {
+          setFocused(data.focused);
+        }, 100);
+      } catch (e) {
+        void e;
+      } finally {
+        hasAttemptedToReadOpenFiles.current = filePath;
+      }
+    })();
+  }, [filePath, setOpenFiles, setFocused]);
+
+  useEffect(() => {
+    (async () => {
+      if (!filePath || hasAttemptedToReadOpenFiles.current !== filePath) return;
+      const savePath = await path.join(
+        filePath,
+        ".crosscode",
+        "openFiles.json"
+      );
+      let data = {
+        files: openFiles,
+        focused: focused ?? 0,
+      };
+      writeTextFile(savePath, JSON.stringify(data)).catch((err) => {
+        console.error("Error writing openFiles.json:", err);
+      });
+    })();
+  }, [openFiles, filePath, focused]);
 
   useEffect(() => {
     globalEditorServiceCallbacks.currentTabsRef = currentTabsRef;
@@ -229,6 +293,18 @@ export default ({
     };
   }, [initialized]);
 
+  useEffect(() => {
+    if (editor === null) return;
+    let listener = editor.onDidScrollChange((e) => {
+      if (focused !== undefined) {
+        scrollStates.current[tabs[focused].file] = [e.scrollTop, e.scrollLeft];
+      }
+    });
+    return () => {
+      listener.dispose();
+    };
+  }, [editor, focused, tabs]);
+
   useEffect(() => {
     if (!editor || !initialized) return;
     monaco.editor.setTheme(mode === "dark" ? "vs-dark" : "vs");
@@ -376,10 +452,22 @@ export default ({
           }
         });
       });
-      setSaveFile(() => modelRef.object.save.bind(modelRef.object));
+
+      setSaveFile(() => async () => {
+        if (formatOnSave) {
+          await editor.getAction("editor.action.formatDocument")?.run();
+        }
+        await modelRef.object.save();
+      });
 
       editor.setModel(modelRef.object.textEditorModel);
 
+      if (scrollStates.current && scrollStates.current[filePath]) {
+        const [scrollTop, scrollLeft] = scrollStates.current[filePath];
+        editor.setScrollTop(scrollTop);
+        editor.setScrollLeft(scrollLeft);
+      }
+
       // I don't love doing it like this but it seems to improve consistency over just running it directly
       requestAnimationFrame(() => {
         if (
@@ -409,7 +497,7 @@ export default ({
       });
     };
     switchFile();
-  }, [focused, editor, tabs]);
+  }, [focused, editor, tabs, formatOnSave]);
 
   return (
     <div className={"editor"}>
@@ -418,6 +506,12 @@ export default ({
         onDragOver={handleContainerDragOver}
         onDragLeave={handleDragLeave}
         onDrop={handleDrop}
+        onWheel={(e) => {
+          if (e.deltaY !== 0) {
+            e.currentTarget.scrollLeft += e.deltaY;
+            e.preventDefault();
+          }
+        }}
       >
         {tabs.map((tab, index) => {
           let unsaved = unsavedFiles.includes(tab.file);

src/components/Tiles/Editor.css

@@ -5,6 +5,7 @@ import Convert from "ansi-to-html";
 import { Virtuoso } from "react-virtuoso";
 import { escapeHtml } from "./Console";
 import React from "react";
+import { useParams } from "react-router";
 
 const convert = new Convert();
 
@@ -31,6 +32,12 @@ export default React.forwardRef<FilteredConsoleHandle, FilteredConsoleProps>(
       },
     }));
 
+    const { path } = useParams<"path">();
+
+    useEffect(() => {
+      setConsoleLines([]);
+    }, [path]);
+
     useEffect(() => {
       if (!listenerAdded.current) {
         (async () => {

src/components/Tiles/Editor.tsx

@@ -42,7 +42,7 @@ export default () => {
   const { storeInitialized, store } = useContext(StoreContext);
   const [openFile, setOpenFile] = useState<string | null>(null);
   const [openFiles, setOpenFiles] = useState<string[]>([]);
-  const [saveFile, setSaveFile] = useState<(() => void) | null>(null);
+  const [saveFile, setSaveFile] = useState<(() => Promise<void>) | null>(null);
   const [undo, setUndo] = useState<(() => void) | null>(null);
   const [redo, setRedo] = useState<(() => void) | null>(null);
   const [theme] = useStore<"light" | "dark">("appearance/theme", "dark");
@@ -73,7 +73,9 @@ export default () => {
     throw new Error("Path parameter is required in IDE component");
   }
 
-  const [callbacks, setCallbacks] = useState<Record<string, () => void>>({});
+  const [callbacks, setCallbacks] = useState<
+    Record<string, (() => void) | (() => Promise<void>)>
+  >({});
   const navigate = useNavigate();
   const [projectValidation, setProjectValidation] =
     useState<ProjectValidation | null>(null);
@@ -188,7 +190,7 @@ export default () => {
 
   useEffect(() => {
     setCallbacks({
-      save: saveFile ?? (() => {}),
+      save: saveFile ?? (async () => {}),
       openFolderDialog,
       newProject: () => navigate("/new"),
       welcomePage: () => navigate("/"),

src/components/Tiles/FilteredConsole.tsx

@@ -2,17 +2,23 @@ import { createPreferencePage, createItems } from "../helpers";
 
 export const sourceKitPage = createPreferencePage(
   "sourcekit",
-  "SourceKit LSP",
+  "Language Features",
   [
     createItems.checkbox(
       "startup",
       "Auto-Launch SourceKit",
       "Automatically start sourcekit-lsp when you open a project",
       true
     ),
+    createItems.checkbox(
+      "format",
+      "Format on save",
+      "Automatically format your code when you save",
+      true
+    ),
   ],
   {
-    description: "Customize the look and feel of the application",
-    category: "general",
+    description: "Configure SourceKit-LSP and other language features",
+    category: "swift",
   }
 );