From 023a95354e66c5f7f3e834481020b35d1bca70a2 Mon Sep 17 00:00:00 2001
From: UnnaturalTwilight <107954129+UnnaturalTwilight@users.noreply.github.com>
Date: Thu, 11 Jun 2026 13:44:04 -0400
Subject: [PATCH] fix: Load settings before parsing args

---
 crates/edit/src/bin/edit/main.rs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/crates/edit/src/bin/edit/main.rs b/crates/edit/src/bin/edit/main.rs
index 18f70eeacbc..c15113941f6 100644
--- a/crates/edit/src/bin/edit/main.rs
+++ b/crates/edit/src/bin/edit/main.rs
@@ -71,16 +71,18 @@ fn run() -> apperr::Result<()> {
     localization::init();
 
     let mut state = State::new()?;
+
+    // Load settings so user file associations are ready when opening files passed as args
+    if let Err(err) = Settings::reload() {
+        state.add_error(err);
+    }
+
     if handle_args(&mut state)? {
         return Ok(());
     }
 
     handle_stdin(&mut state)?;
 
-    if let Err(err) = Settings::reload() {
-        state.add_error(err);
-    }
-
     // Switch the terminal to raw mode which prevents the user from pressing Ctrl+C.
     // `handle_args` may want to print a help message (must not fail),
     // and reads files (may hang; should be cancelable with Ctrl+C).