Add Undo Registration

Author: thecoolwinter

CodeEdit/Features/Documents/Controllers/CodeEditSplitViewController.swift

@@ -76,6 +76,7 @@ final class CodeEditSplitViewController: NSSplitViewController {
                     .environmentObject(statusBarViewModel)
                     .environmentObject(utilityAreaModel)
                     .environmentObject(taskManager)
+                    .environmentObject(workspace.undoRegistration)
             }
         }
 

CodeEdit/Features/Documents/WorkspaceDocument/WorkspaceDocument.swift

@@ -45,6 +45,8 @@ final class WorkspaceDocument: NSDocument, ObservableObject, NSToolbarDelegate {
     var workspaceSettingsManager: CEWorkspaceSettings?
     var taskNotificationHandler: TaskNotificationHandler = TaskNotificationHandler()
 
+    var undoRegistration: UndoManagerRegistration = UndoManagerRegistration()
+
     @Published var notificationPanel = NotificationPanelViewModel()
     private var cancellables = Set<AnyCancellable>()
 

…itor/Models/EditorStateRestoration.swift …Restoration/EditorStateRestoration.swiftCodeEdit/Features/Editor/Models/EditorStateRestoration.swift renamed to CodeEdit/Features/Editor/Models/Restoration/EditorStateRestoration.swift CodeEdit/Features/Editor/Models/EditorStateRestoration.swift renamed to CodeEdit/Features/Editor/Models/Restoration/EditorStateRestoration.swift

@@ -0,0 +1,27 @@
+//
+//  UndoManagerRegistration.swift
+//  CodeEdit
+//
+//  Created by Khan Winter on 6/27/25.
+//
+
+import SwiftUI
+import CodeEditTextView
+
+/// Very simple class for registering undo manager for files for a project session. This does not do any saving, it
+/// just stores the undo managers in memory and retrieves them as necessary for files.
+final class UndoManagerRegistration: ObservableObject {
+    private var managerMap: [CEWorkspaceFile.ID: CEUndoManager] = [:]
+
+    init() { }
+
+    func manager(forFile file: CEWorkspaceFile) -> CEUndoManager {
+        if let manager = managerMap[file.id] {
+            return manager
+        } else {
+            let newManager = CEUndoManager()
+            managerMap[file.id] = newManager
+            return newManager
+        }
+    }
+}

CodeEdit/Features/Editor/Models/Restoration/UndoManagerRegistration.swift

@@ -58,6 +58,9 @@ struct CodeFileView: View {
     @Environment(\.colorScheme)
     private var colorScheme
 
+    @EnvironmentObject
+    var undoRegistration: UndoManagerRegistration
+
     @ObservedObject private var themeModel: ThemeModel = .shared
 
     @State private var treeSitter = TreeSitterClient()
@@ -66,8 +69,6 @@ struct CodeFileView: View {
 
     private let isEditable: Bool
 
-    private let undoManager: CEUndoManager
-
     init(
         editorInstance: EditorInstance,
         codeFile: CodeFileDocument,
@@ -88,15 +89,6 @@ struct CodeFileView: View {
             editorInstance.cursorPositions = openOptions.cursorPositions
         }
 
-        // Share the undo manager for the document between editors
-        if let undoManager = codeFile.undoManager as? CEUndoManager {
-            self.undoManager = undoManager
-        } else {
-            let undoManager = CEUndoManager()
-            codeFile.undoManager = undoManager
-            self.undoManager = undoManager
-        }
-
         updateHighlightProviders()
 
         codeFile
@@ -170,7 +162,7 @@ struct CodeFileView: View {
                 }
             ),
             highlightProviders: highlightProviders,
-            undoManager: undoManager,
+            undoManager: undoRegistration.manager(forFile: editorInstance.file),
             coordinators: textViewCoordinators
         )
         .id(codeFile.fileURL)

CodeEdit/Features/Editor/Views/CodeFileView.swift

@@ -12,6 +12,7 @@ import SwiftUI
 /// # Should **not** be used other than in a single file window.
 struct WindowCodeFileView: View {
     @StateObject var editorInstance: EditorInstance
+    @StateObject var undoRegistration: UndoManagerRegistration = UndoManagerRegistration()
     var codeFile: CodeFileDocument
 
     init(codeFile: CodeFileDocument) {
@@ -27,6 +28,7 @@ struct WindowCodeFileView: View {
     var body: some View {
         if let utType = codeFile.utType, utType.conforms(to: .text) {
             CodeFileView(editorInstance: editorInstance, codeFile: codeFile)
+                .environmentObject(undoRegistration)
         } else {
             NonTextFileView(fileDocument: codeFile)
         }