From e1fda49d913fee5c9fe43e613ea4d61c1f044a08 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Fri, 16 Aug 2024 17:06:59 -0400
Subject: [PATCH] chore: Refactor EditorManager to improve code organization
 and readability

---
 src/app/editor/editor_manager.cc | 23 +++++++++++------------
 src/app/editor/editor_manager.h  |  6 ++++--
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/app/editor/editor_manager.cc b/src/app/editor/editor_manager.cc
index 2c1decea..7993ade8 100644
--- a/src/app/editor/editor_manager.cc
+++ b/src/app/editor/editor_manager.cc
@@ -261,7 +261,6 @@ void EditorManager::ManageKeyboardShortcuts() {
     manager.Load();
     if (!manager.GetRecentFiles().empty()) {
       auto front = manager.GetRecentFiles().front();
-      std::cout << "Reloading: " << front << std::endl;
       OpenRomOrProject(front);
     }
   }
@@ -427,17 +426,6 @@ void EditorManager::DrawYazeMenu() {
   }
 }
 
-void EditorManager::OpenRomOrProject(const std::string& filename) {
-  if (absl::StrContains(filename, ".yaze")) {
-    status_ = current_project_.Open(filename);
-    if (status_.ok()) {
-      status_ = OpenProject();
-    }
-  } else {
-    status_ = rom()->LoadFromFile(filename);
-  }
-}
-
 void EditorManager::DrawYazeMenuBar() {
   static bool save_as_menu = false;
   static bool new_project_menu = false;
@@ -805,6 +793,17 @@ void EditorManager::SaveRom() {
   status_ = rom()->SaveToFile(backup_rom_, save_new_auto_);
 }
 
+void EditorManager::OpenRomOrProject(const std::string& filename) {
+  if (absl::StrContains(filename, ".yaze")) {
+    status_ = current_project_.Open(filename);
+    if (status_.ok()) {
+      status_ = OpenProject();
+    }
+  } else {
+    status_ = rom()->LoadFromFile(filename);
+  }
+}
+
 absl::Status EditorManager::OpenProject() {
   RETURN_IF_ERROR(rom()->LoadFromFile(current_project_.rom_filename_));
 
diff --git a/src/app/editor/editor_manager.h b/src/app/editor/editor_manager.h
index ad27d3ef..bccb72ed 100644
--- a/src/app/editor/editor_manager.h
+++ b/src/app/editor/editor_manager.h
@@ -8,6 +8,7 @@
 #include "absl/status/status.h"
 #include "app/core/common.h"
 #include "app/core/constants.h"
+#include "app/core/message.h"
 #include "app/core/project.h"
 #include "app/editor/code/assembly_editor.h"
 #include "app/editor/code/memory_editor.h"
@@ -18,9 +19,9 @@
 #include "app/editor/message/message_editor.h"
 #include "app/editor/music/music_editor.h"
 #include "app/editor/overworld/overworld_editor.h"
-#include "app/editor/system/settings_editor.h"
 #include "app/editor/sprite/sprite_editor.h"
 #include "app/editor/system/extension_manager.h"
+#include "app/editor/system/settings_editor.h"
 #include "app/editor/utils/gfx_context.h"
 #include "app/emu/emulator.h"
 #include "app/gfx/snes_palette.h"
@@ -81,7 +82,6 @@ class EditorManager : public SharedRom,
  private:
   void ManageActiveEditors();
   void ManageKeyboardShortcuts();
-  void OpenRomOrProject(const std::string& filename);
 
   void DrawFileDialog();
   void DrawStatusPopup();
@@ -94,6 +94,7 @@ class EditorManager : public SharedRom,
   void LoadRom();
   void SaveRom();
 
+  void OpenRomOrProject(const std::string& filename);
   absl::Status OpenProject();
 
   bool quit_ = false;
@@ -112,6 +113,7 @@ class EditorManager : public SharedRom,
   Project current_project_;
   yaze_editor_context editor_context_;
   ExtensionManager extension_manager_;
+  core::MessageDispatcher dispatcher_;
 
   AssemblyEditor assembly_editor_;
   DungeonEditor dungeon_editor_;