From 6e2d3aae68821d713b80ef6dc8287b4d7a012426 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Thu, 27 Oct 2022 12:46:14 -0700
Subject: [PATCH] Merge pull request #1828 from
 zed-industries/following-scrollbar

Show scrollbar when scrolling while following
---
 crates/client/src/amplitude_telemetry.rs | 10 ++--------
 crates/client/src/telemetry.rs           | 10 ++--------
 crates/editor/src/blink_manager.rs       |  1 -
 crates/editor/src/editor.rs              |  1 +
 4 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/crates/client/src/amplitude_telemetry.rs b/crates/client/src/amplitude_telemetry.rs
index 5db2bedf03016b59fc81c54fa5d1cf0f999e5140..36aeeb39285ec07b00a9d3f4bf45c29a25509794 100644
--- a/crates/client/src/amplitude_telemetry.rs
+++ b/crates/client/src/amplitude_telemetry.rs
@@ -97,15 +97,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 02c1790664c28758cf366e43948b4aa2396032ec..d2ead6b3410c12360031671063dff51d96ffc2ad 100644
--- a/crates/client/src/telemetry.rs
+++ b/crates/client/src/telemetry.rs
@@ -103,15 +103,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(),
diff --git a/crates/editor/src/blink_manager.rs b/crates/editor/src/blink_manager.rs
index df66ec2125a8a7fa73a2bf9cc2943cd04e29fc88..681692f0f5428362c35caca8f4030d8222821cec 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;
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 32e58a5d82cc4a5df090ffcd7ea1f636a94cc668..327f143db57e725f138b15e12f9a90e289973417 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();
     }