From 8922437fcd0ae13ab6e3ba23cdac071ff20e7f2a Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Mon, 9 Oct 2023 18:13:52 -0600
Subject: [PATCH] code review

---
 crates/call/src/room.rs                          |  2 +-
 crates/workspace/src/workspace.rs                | 14 ++------------
 crates/zed/Cargo.toml                            |  2 +-
 crates/zed/resources/zed.entitlements            | 12 ++++++++----
 crates/zed/src/main.rs                           | 13 ++-----------
 crates/zed/src/{open_url.rs => open_listener.rs} | 10 ----------
 6 files changed, 14 insertions(+), 39 deletions(-)
 rename crates/zed/src/{open_url.rs => open_listener.rs} (92%)

diff --git a/crates/call/src/room.rs b/crates/call/src/room.rs
index b7aeee90e20300c916db50a12ccd5dcc6d06b334..32b8232b4f76f73eb35d5f45d7d5a902f2d50a18 100644
--- a/crates/call/src/room.rs
+++ b/crates/call/src/room.rs
@@ -878,7 +878,7 @@ impl Room {
         Ok(())
     }
 
-    pub fn next_room_update(&mut self) -> impl Future<Output = ()> {
+    pub fn room_update_completed(&mut self) -> impl Future<Output = ()> {
         let mut done_rx = self.room_update_completed_rx.clone();
         async move {
             while let Some(result) = done_rx.next().await {
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index e690757af71748d66d688510c5fd515c9d8a1343..c021384d91067fd52e649211760eb732079e3b8c 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -47,7 +47,6 @@ use std::{
     any::TypeId,
     borrow::Cow,
     cmp, env,
-    fs::OpenOptions,
     future::Future,
     path::{Path, PathBuf},
     rc::Rc,
@@ -4246,7 +4245,8 @@ async fn join_channel_internal(
         })
         .await?;
 
-    room.update(cx, |room, _| room.next_room_update()).await;
+    room.update(cx, |room, _| room.room_update_completed())
+        .await;
 
     let task = room.update(cx, |room, cx| {
         if let Some((project, host)) = room.most_active_project(cx) {
@@ -4259,16 +4259,6 @@ async fn join_channel_internal(
         task.await?;
         return anyhow::Ok(true);
     }
-    use std::io::Write;
-    writeln!(
-        OpenOptions::new()
-            .write(true)
-            .append(true)
-            .open("/Users/conrad/dbg")
-            .unwrap(),
-        "no jokes"
-    )
-    .unwrap();
     anyhow::Ok(false)
 }
 
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index 3c93462d4b9182fb362d623455d52c9212d8cc9d..7eb14559be8ab64e44eabf55eaf8837338473d06 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -156,7 +156,7 @@ workspace = { path = "../workspace", features = ["test-support"] }
 
 unindent.workspace = true
 
-[package.metadata.bundle]
+[package.metadata.bundle-dev]
 icon = ["resources/app-icon-preview@2x.png", "resources/app-icon-preview.png"]
 identifier = "dev.zed.Zed-Dev"
 name = "Zed Dev"
diff --git a/crates/zed/resources/zed.entitlements b/crates/zed/resources/zed.entitlements
index 9f5414243de13b87e419849ab63c68eb45ab1ce0..f40a8a253ad082bc08e48ed8684b2d553d5065e8 100644
--- a/crates/zed/resources/zed.entitlements
+++ b/crates/zed/resources/zed.entitlements
@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>com.apple.developer.associated-domains</key>
-	<array><string>applinks:cirw.in</string></array>
 	<key>com.apple.security.automation.apple-events</key>
 	<true/>
 	<key>com.apple.security.cs.allow-jit</key>
@@ -12,8 +10,14 @@
 	<true/>
 	<key>com.apple.security.device.camera</key>
 	<true/>
-	<key>com.apple.security.keychain-access-groups</key>
-	<array><string>MQ55VZLNZQ.dev.zed.Shared</string></array>
+	<key>com.apple.security.personal-information.addressbook</key>
+	<true/>
+	<key>com.apple.security.personal-information.calendars</key>
+	<true/>
+	<key>com.apple.security.personal-information.location</key>
+	<true/>
+	<key>com.apple.security.personal-information.photos-library</key>
+	<true/>
 	<!-- <key>com.apple.security.cs.disable-library-validation</key>
 	<true/> -->
 </dict>
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index 004e5769d57666d1df0fb8e972aa445ddecf7980..a75caa54f6eb3a8240da736cb376e7e653da9158 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -61,20 +61,11 @@ use zed::{
     only_instance::{ensure_only_instance, IsOnlyInstance},
 };
 
-use crate::open_url::{OpenListener, OpenRequest};
+use crate::open_listener::{OpenListener, OpenRequest};
 
-mod open_url;
+mod open_listener;
 
 fn main() {
-    writeln!(
-        OpenOptions::new()
-            .write(true)
-            .append(true)
-            .open("/Users/conrad/dbg")
-            .unwrap(),
-        "HELLO"
-    )
-    .unwrap();
     let http = http::client();
     init_paths();
     init_logger();
diff --git a/crates/zed/src/open_url.rs b/crates/zed/src/open_listener.rs
similarity index 92%
rename from crates/zed/src/open_url.rs
rename to crates/zed/src/open_listener.rs
index 8cad217a8c952358d9aa613e6cdc2f934fd361de..e3c08ff2c8e6aebdcf96af4b18d7751faf0ffc44 100644
--- a/crates/zed/src/open_url.rs
+++ b/crates/zed/src/open_listener.rs
@@ -43,16 +43,6 @@ impl OpenListener {
     }
 
     pub fn open_urls(&self, urls: Vec<String>) {
-        writeln!(
-            OpenOptions::new()
-                .write(true)
-                .append(true)
-                .open("/Users/conrad/dbg")
-                .unwrap(),
-            "{:?}",
-            &urls,
-        )
-        .unwrap();
         self.triggered.store(true, Ordering::Release);
         let request = if let Some(server_name) =
             urls.first().and_then(|url| url.strip_prefix("zed-cli://"))