Fix compile errors

Antonio Scandurra created 2 years ago

Change summary

assets/keymaps/default.json | 6 +++---
crates/ai/src/assistant.rs  | 7 +++----
crates/editor/src/editor.rs | 1 +
3 files changed, 7 insertions(+), 7 deletions(-)

Detailed changes

assets/keymaps/default.json

@@ -185,7 +185,8 @@
       ],
       "alt-\\": "copilot::Suggest",
       "alt-]": "copilot::NextSuggestion",
-      "alt-[": "copilot::PreviousSuggestion"
+      "alt-[": "copilot::PreviousSuggestion",
+      "cmd->": "assistant::QuoteSelection"
     }
   },
   {
@@ -199,8 +200,7 @@
     "context": "ContextEditor > Editor",
     "bindings": {
       "cmd-enter": "assistant::Assist",
-      "escape": "assistant::CancelLastAssist",
-      "cmd-?": "assistant::QuoteSelection"
+      "cmd->": "assistant::QuoteSelection"
     }
   },
   {

crates/ai/src/assistant.rs

@@ -19,10 +19,7 @@ use workspace::{
     pane, Pane, Workspace,
 };
 
-actions!(
-    assistant,
-    [NewContext, Assist, CancelLastAssist, QuoteSelection]
-);
+actions!(assistant, [NewContext, Assist, QuoteSelection]);
 
 pub fn init(cx: &mut AppContext) {
     cx.add_action(AssistantEditor::assist);
@@ -69,6 +66,7 @@ impl AssistantPanel {
                                 .with_child(Pane::render_tab_bar_button(
                                     0,
                                     "icons/plus_12.svg",
+                                    false,
                                     Some(("New Context".into(), Some(Box::new(NewContext)))),
                                     cx,
                                     move |_, _| todo!(),
@@ -81,6 +79,7 @@ impl AssistantPanel {
                                     } else {
                                         "icons/maximize_8.svg"
                                     },
+                                    pane.is_zoomed(),
                                     Some((
                                         "Toggle Zoom".into(),
                                         Some(Box::new(workspace::ToggleZoom)),

crates/editor/src/editor.rs

@@ -31,6 +31,7 @@ use copilot::Copilot;
 pub use display_map::DisplayPoint;
 use display_map::*;
 pub use editor_settings::EditorSettings;
+pub use element::RenderExcerptHeaderParams;
 pub use element::{
     Cursor, EditorElement, HighlightedRange, HighlightedRangeLine, LineWithInvisibles,
 };