From cbd856ff3ed46751c389a22599a5bb087b92ebb7 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Mon, 13 Apr 2026 10:02:00 -0600
Subject: [PATCH] Revert "Fix duplicate window when opening from CLI on macOS
 (#48146)" (#53814)

This reverts commit 5be9dc1781ef6d2cbfbdbcd417edd0935cbb83a8.

This change breaks dragging directories onto the App icon (or using the
directories listed in the menu on the app icon in the doc)

Release Notes:

- N/A
---
 crates/gpui_macos/src/platform.rs | 69 +++++++++++--------------------
 1 file changed, 23 insertions(+), 46 deletions(-)

diff --git a/crates/gpui_macos/src/platform.rs b/crates/gpui_macos/src/platform.rs
index c0f721842a5f5dcacd809b5a6d896335ca4f0e45..9444be19d7ef81d64dde62d205dde07c3cd40629 100644
--- a/crates/gpui_macos/src/platform.rs
+++ b/crates/gpui_macos/src/platform.rs
@@ -62,9 +62,6 @@ use util::{
 const NSUTF8StringEncoding: NSUInteger = 4;
 
 const MAC_PLATFORM_IVAR: &str = "platform";
-const INTERNET_EVENT_CLASS: u32 = 0x4755524c; // 'GURL'
-const AE_GET_URL: u32 = 0x4755524c; // 'GURL'
-const DIRECT_OBJECT_KEY: u32 = 0x2d2d2d2d; // '----'
 static mut APP_CLASS: *const Class = ptr::null();
 static mut APP_DELEGATE_CLASS: *const Class = ptr::null();
 
@@ -139,8 +136,8 @@ unsafe fn build_classes() {
                 handle_dock_menu as extern "C" fn(&mut Object, Sel, id) -> id,
             );
             decl.add_method(
-                sel!(handleGetURLEvent:withReplyEvent:),
-                handle_get_url_event as extern "C" fn(&mut Object, Sel, id, id),
+                sel!(application:openURLs:),
+                open_urls as extern "C" fn(&mut Object, Sel, id, id),
             );
 
             decl.add_method(
@@ -1182,7 +1179,7 @@ unsafe fn get_mac_platform(object: &mut Object) -> &MacPlatform {
     }
 }
 
-extern "C" fn will_finish_launching(this: &mut Object, _: Sel, _: id) {
+extern "C" fn will_finish_launching(_this: &mut Object, _: Sel, _: id) {
     unsafe {
         let user_defaults: id = msg_send![class!(NSUserDefaults), standardUserDefaults];
 
@@ -1196,17 +1193,6 @@ extern "C" fn will_finish_launching(this: &mut Object, _: Sel, _: id) {
             let false_value: id = msg_send![class!(NSNumber), numberWithBool:false];
             let _: () = msg_send![user_defaults, setObject: false_value forKey: name];
         }
-
-        // Register kAEGetURL Apple Event handler so that URL open requests are
-        // delivered synchronously before applicationDidFinishLaunching:, replacing
-        // application:openURLs: which has non-deterministic timing.
-        let event_manager: id = msg_send![class!(NSAppleEventManager), sharedAppleEventManager];
-        let _: () = msg_send![event_manager,
-            setEventHandler: this as id
-            andSelector: sel!(handleGetURLEvent:withReplyEvent:)
-            forEventClass: INTERNET_EVENT_CLASS
-            andEventID: AE_GET_URL
-        ];
     }
 }
 
@@ -1303,36 +1289,27 @@ extern "C" fn on_thermal_state_change(this: &mut Object, _: Sel, _: id) {
     }
 }
 
-extern "C" fn handle_get_url_event(this: &mut Object, _: Sel, event: id, _reply: id) {
-    unsafe {
-        let descriptor: id = msg_send![event, paramDescriptorForKeyword: DIRECT_OBJECT_KEY];
-        if descriptor == nil {
-            return;
-        }
-        let url_string: id = msg_send![descriptor, stringValue];
-        if url_string == nil {
-            return;
-        }
-        let utf8_ptr = url_string.UTF8String() as *mut c_char;
-        if utf8_ptr.is_null() {
-            return;
-        }
-        let url_str = CStr::from_ptr(utf8_ptr);
-        match url_str.to_str() {
-            Ok(string) => {
-                let urls = vec![string.to_string()];
-                let platform = get_mac_platform(this);
-                let mut lock = platform.0.lock();
-                if let Some(mut callback) = lock.open_urls.take() {
-                    drop(lock);
-                    callback(urls);
-                    platform.0.lock().open_urls.get_or_insert(callback);
+extern "C" fn open_urls(this: &mut Object, _: Sel, _: id, urls: id) {
+    let urls = unsafe {
+        (0..urls.count())
+            .filter_map(|i| {
+                let url = urls.objectAtIndex(i);
+                match CStr::from_ptr(url.absoluteString().UTF8String() as *mut c_char).to_str() {
+                    Ok(string) => Some(string.to_string()),
+                    Err(err) => {
+                        log::error!("error converting path to string: {}", err);
+                        None
+                    }
                 }
-            }
-            Err(err) => {
-                log::error!("error converting URL to string: {}", err);
-            }
-        }
+            })
+            .collect::<Vec<_>>()
+    };
+    let platform = unsafe { get_mac_platform(this) };
+    let mut lock = platform.0.lock();
+    if let Some(mut callback) = lock.open_urls.take() {
+        drop(lock);
+        callback(urls);
+        platform.0.lock().open_urls.get_or_insert(callback);
     }
 }