fix merge conflicts

crates/settings_ui/src/keybindings.rs

@@ -14,9 +14,9 @@ use gpui::{
     Action, AppContext as _, AsyncApp, Axis, ClickEvent, Context, DismissEvent, Entity,
     EventEmitter, FocusHandle, Focusable, Global, IsZero,
     KeyBindingContextPredicate::{And, Descendant, Equal, Identifier, Not, NotEqual, Or},
-    KeyContext, KeybindingKeystroke,Keystroke, MouseButton, Point, ScrollStrategy, ScrollWheelEvent, Stateful,
-    StyledText, Subscription, Task, TextStyleRefinement, WeakEntity, actions, anchored, deferred,
-    div,
+    KeyContext, KeybindingKeystroke, Keystroke, MouseButton, Point, ScrollStrategy,
+    ScrollWheelEvent, Stateful, StyledText, Subscription, Task, TextStyleRefinement, WeakEntity,
+    actions, anchored, deferred, div,
 };
 use language::{Language, LanguageConfig, ToOffset as _};
 use notifications::status_toast::{StatusToast, ToastIcon};
@@ -236,7 +236,7 @@ struct ConflictState {
 }
 
 type ConflictKeybindMapping = HashMap<
-    Vec<Keystroke>,
+    Vec<KeybindingKeystroke>,
     Vec<(
         Option<gpui::KeyBindingContextPredicate>,
         Vec<ConflictOrigin>,

crates/ui/src/components/keybinding.rs

@@ -165,7 +165,7 @@ pub fn render_keybinding_keystroke(
     if use_text {
         let element = Key::new(
             keystroke_text(
-                &keystroke.modifiers,
+                &keystroke.display_modifiers,
                 &keystroke.display_key,
                 platform_style,
                 vim_mode,
@@ -178,7 +178,7 @@ pub fn render_keybinding_keystroke(
     } else {
         let mut elements = Vec::new();
         elements.extend(render_modifiers(
-            &keystroke.modifiers,
+            &keystroke.display_modifiers,
             platform_style,
             color,
             size,
@@ -418,7 +418,7 @@ pub fn text_for_keybinding_keystrokes(keystrokes: &[KeybindingKeystroke], cx: &A
         .iter()
         .map(|keystroke| {
             keystroke_text(
-                &keystroke.modifiers,
+                &keystroke.display_modifiers,
                 &keystroke.display_key,
                 platform_style,
                 vim_enabled,