From dd13c95158b147f4676ea730723e476fb4b1bce7 Mon Sep 17 00:00:00 2001
From: Zachiah Sawyer <zachiah@proton.me>
Date: Mon, 15 Dec 2025 02:40:37 -0800
Subject: [PATCH] Make `cmd-click` require the modifier on mousedown (#44579)

Closes #44537

Release Notes:

- Improved Cmd+Click behavior. Now requires Cmd to be pressed before the
click starts or it doesn't run
---
 crates/editor/src/element.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 653cf291a7ff2ea79152535392241ae94eaf05f3..5a5b32e1755f5a026800f3af3c1cedaf6b11996d 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -1017,10 +1017,16 @@ impl EditorElement {
         let pending_nonempty_selections = editor.has_pending_nonempty_selection();
 
         let hovered_link_modifier = Editor::is_cmd_or_ctrl_pressed(&event.modifiers(), cx);
+        let mouse_down_hovered_link_modifier = if let ClickEvent::Mouse(mouse_event) = event {
+            Editor::is_cmd_or_ctrl_pressed(&mouse_event.down.modifiers, cx)
+        } else {
+            true
+        };
 
         if let Some(mouse_position) = event.mouse_position()
             && !pending_nonempty_selections
             && hovered_link_modifier
+            && mouse_down_hovered_link_modifier
             && text_hitbox.is_hovered(window)
         {
             let point = position_map.point_for_position(mouse_position);