edit predictions: Do not use conflict context for other providers (#24807)

Agus Zubiaga created 

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

Release Notes:

- N/A

Change summary

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

Detailed changes

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()