From d79aeba2c13e072b12cf28dd25663500a581e512 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Thu, 27 Oct 2022 12:42:03 -0700
Subject: [PATCH 1/3] Avoid spurious log messages in development builds

---
 crates/client/src/amplitude_telemetry.rs | 10 ++--------
 crates/client/src/telemetry.rs           | 10 ++--------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/crates/client/src/amplitude_telemetry.rs b/crates/client/src/amplitude_telemetry.rs
index ef0ec2e209..f463dbf078 100644
--- a/crates/client/src/amplitude_telemetry.rs
+++ b/crates/client/src/amplitude_telemetry.rs
@@ -98,15 +98,9 @@ impl AmplitudeTelemetry {
                 .unwrap()
                 .as_millis(),
             state: Mutex::new(AmplitudeTelemetryState {
-                os_version: platform
-                    .os_version()
-                    .log_err()
-                    .map(|v| v.to_string().into()),
+                os_version: platform.os_version().ok().map(|v| v.to_string().into()),
                 os_name: platform.os_name().into(),
-                app_version: platform
-                    .app_version()
-                    .log_err()
-                    .map(|v| v.to_string().into()),
+                app_version: platform.app_version().ok().map(|v| v.to_string().into()),
                 device_id: None,
                 queue: Default::default(),
                 flush_task: Default::default(),
diff --git a/crates/client/src/telemetry.rs b/crates/client/src/telemetry.rs
index 850001f6d8..d95460a15f 100644
--- a/crates/client/src/telemetry.rs
+++ b/crates/client/src/telemetry.rs
@@ -104,15 +104,9 @@ impl Telemetry {
             http_client: client,
             executor: cx.background().clone(),
             state: Mutex::new(TelemetryState {
-                os_version: platform
-                    .os_version()
-                    .log_err()
-                    .map(|v| v.to_string().into()),
+                os_version: platform.os_version().ok().map(|v| v.to_string().into()),
                 os_name: platform.os_name().into(),
-                app_version: platform
-                    .app_version()
-                    .log_err()
-                    .map(|v| v.to_string().into()),
+                app_version: platform.app_version().ok().map(|v| v.to_string().into()),
                 device_id: None,
                 metrics_id: None,
                 queue: Default::default(),

From 7ba95d5d6ca07763d34920928ec6878bf42ab959 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Thu, 27 Oct 2022 12:42:20 -0700
Subject: [PATCH 2/3] :fire: stray dbg

---
 crates/editor/src/blink_manager.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/crates/editor/src/blink_manager.rs b/crates/editor/src/blink_manager.rs
index df66ec2125..681692f0f5 100644
--- a/crates/editor/src/blink_manager.rs
+++ b/crates/editor/src/blink_manager.rs
@@ -71,7 +71,6 @@ impl BlinkManager {
             if epoch == self.blink_epoch && self.enabled && !self.blinking_paused {
                 self.visible = !self.visible;
                 cx.notify();
-                dbg!(cx.handle());
 
                 let epoch = self.next_blink_epoch();
                 let interval = self.blink_interval;

From d5fbb5965633f9de842733bbcd08810112f02764 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Thu, 27 Oct 2022 12:42:34 -0700
Subject: [PATCH 3/3] Show scrollbar when scrolling while following

---
 crates/editor/src/editor.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 32e58a5d82..327f143db5 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -1353,6 +1353,7 @@ impl Editor {
     ) {
         self.scroll_top_anchor = anchor;
         self.scroll_position = position;
+        self.make_scrollbar_visible(cx);
         cx.emit(Event::ScrollPositionChanged { local: false });
         cx.notify();
     }