From 2db5eed84026583287a583329b309100562740e3 Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Thu, 13 Feb 2025 11:59:52 -0300
Subject: [PATCH] edit predictions: Do not use conflict context for other
 providers (#24807)

This is to avoid confusing copilot/supermaven users when the cursor is
on leading whitespace.

Release Notes:

- N/A
---
 crates/editor/src/editor.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index bc4f780e6a93f763487d8af71827410d289149aa..0da2031f8878c5f0d39751a0f9117d7ece837044 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -1591,6 +1591,10 @@ impl Editor {
     }
 
     pub fn edit_prediction_in_conflict(&self) -> bool {
+        if !self.show_edit_predictions_in_menu() {
+            return false;
+        }
+
         let showing_completions = self
             .context_menu
             .borrow()