@@ -100,107 +100,99 @@ action!(Select, SelectPhase);
pub fn init(cx: &mut MutableAppContext) {
cx.add_bindings(vec![
- Binding::new("escape", Cancel, Some("BufferView")),
- Binding::new("backspace", Backspace, Some("BufferView")),
- Binding::new("ctrl-h", Backspace, Some("BufferView")),
- Binding::new("delete", Delete, Some("BufferView")),
- Binding::new("ctrl-d", Delete, Some("BufferView")),
- Binding::new("enter", Newline(false), Some("BufferView")),
- Binding::new("alt-enter", Newline(true), Some("BufferView")),
- Binding::new("tab", Insert("\t".into()), Some("BufferView")),
- Binding::new("ctrl-shift-K", DeleteLine, Some("BufferView")),
+ Binding::new("escape", Cancel, Some("Editor")),
+ Binding::new("backspace", Backspace, Some("Editor")),
+ Binding::new("ctrl-h", Backspace, Some("Editor")),
+ Binding::new("delete", Delete, Some("Editor")),
+ Binding::new("ctrl-d", Delete, Some("Editor")),
+ Binding::new("enter", Newline(false), Some("Editor")),
+ Binding::new("alt-enter", Newline(true), Some("Editor")),
+ Binding::new("tab", Insert("\t".into()), Some("Editor")),
+ Binding::new("ctrl-shift-K", DeleteLine, Some("Editor")),
Binding::new(
"alt-backspace",
DeleteToPreviousWordBoundary,
- Some("BufferView"),
+ Some("Editor"),
),
- Binding::new("alt-h", DeleteToPreviousWordBoundary, Some("BufferView")),
- Binding::new("alt-delete", DeleteToNextWordBoundary, Some("BufferView")),
- Binding::new("alt-d", DeleteToNextWordBoundary, Some("BufferView")),
- Binding::new("cmd-backspace", DeleteToBeginningOfLine, Some("BufferView")),
- Binding::new("cmd-delete", DeleteToEndOfLine, Some("BufferView")),
- Binding::new("ctrl-k", CutToEndOfLine, Some("BufferView")),
- Binding::new("cmd-shift-D", DuplicateLine, Some("BufferView")),
- Binding::new("ctrl-cmd-up", MoveLineUp, Some("BufferView")),
- Binding::new("ctrl-cmd-down", MoveLineDown, Some("BufferView")),
- Binding::new("cmd-x", Cut, Some("BufferView")),
- Binding::new("cmd-c", Copy, Some("BufferView")),
- Binding::new("cmd-v", Paste, Some("BufferView")),
- Binding::new("cmd-z", Undo, Some("BufferView")),
- Binding::new("cmd-shift-Z", Redo, Some("BufferView")),
- Binding::new("up", MoveUp, Some("BufferView")),
- Binding::new("down", MoveDown, Some("BufferView")),
- Binding::new("left", MoveLeft, Some("BufferView")),
- Binding::new("right", MoveRight, Some("BufferView")),
- Binding::new("ctrl-p", MoveUp, Some("BufferView")),
- Binding::new("ctrl-n", MoveDown, Some("BufferView")),
- Binding::new("ctrl-b", MoveLeft, Some("BufferView")),
- Binding::new("ctrl-f", MoveRight, Some("BufferView")),
- Binding::new("alt-left", MoveToPreviousWordBoundary, Some("BufferView")),
- Binding::new("alt-b", MoveToPreviousWordBoundary, Some("BufferView")),
- Binding::new("alt-right", MoveToNextWordBoundary, Some("BufferView")),
- Binding::new("alt-f", MoveToNextWordBoundary, Some("BufferView")),
- Binding::new("cmd-left", MoveToBeginningOfLine, Some("BufferView")),
- Binding::new("ctrl-a", MoveToBeginningOfLine, Some("BufferView")),
- Binding::new("cmd-right", MoveToEndOfLine, Some("BufferView")),
- Binding::new("ctrl-e", MoveToEndOfLine, Some("BufferView")),
- Binding::new("cmd-up", MoveToBeginning, Some("BufferView")),
- Binding::new("cmd-down", MoveToEnd, Some("BufferView")),
- Binding::new("shift-up", SelectUp, Some("BufferView")),
- Binding::new("ctrl-shift-P", SelectUp, Some("BufferView")),
- Binding::new("shift-down", SelectDown, Some("BufferView")),
- Binding::new("ctrl-shift-N", SelectDown, Some("BufferView")),
- Binding::new("shift-left", SelectLeft, Some("BufferView")),
- Binding::new("ctrl-shift-B", SelectLeft, Some("BufferView")),
- Binding::new("shift-right", SelectRight, Some("BufferView")),
- Binding::new("ctrl-shift-F", SelectRight, Some("BufferView")),
+ Binding::new("alt-h", DeleteToPreviousWordBoundary, Some("Editor")),
+ Binding::new("alt-delete", DeleteToNextWordBoundary, Some("Editor")),
+ Binding::new("alt-d", DeleteToNextWordBoundary, Some("Editor")),
+ Binding::new("cmd-backspace", DeleteToBeginningOfLine, Some("Editor")),
+ Binding::new("cmd-delete", DeleteToEndOfLine, Some("Editor")),
+ Binding::new("ctrl-k", CutToEndOfLine, Some("Editor")),
+ Binding::new("cmd-shift-D", DuplicateLine, Some("Editor")),
+ Binding::new("ctrl-cmd-up", MoveLineUp, Some("Editor")),
+ Binding::new("ctrl-cmd-down", MoveLineDown, Some("Editor")),
+ Binding::new("cmd-x", Cut, Some("Editor")),
+ Binding::new("cmd-c", Copy, Some("Editor")),
+ Binding::new("cmd-v", Paste, Some("Editor")),
+ Binding::new("cmd-z", Undo, Some("Editor")),
+ Binding::new("cmd-shift-Z", Redo, Some("Editor")),
+ Binding::new("up", MoveUp, Some("Editor")),
+ Binding::new("down", MoveDown, Some("Editor")),
+ Binding::new("left", MoveLeft, Some("Editor")),
+ Binding::new("right", MoveRight, Some("Editor")),
+ Binding::new("ctrl-p", MoveUp, Some("Editor")),
+ Binding::new("ctrl-n", MoveDown, Some("Editor")),
+ Binding::new("ctrl-b", MoveLeft, Some("Editor")),
+ Binding::new("ctrl-f", MoveRight, Some("Editor")),
+ Binding::new("alt-left", MoveToPreviousWordBoundary, Some("Editor")),
+ Binding::new("alt-b", MoveToPreviousWordBoundary, Some("Editor")),
+ Binding::new("alt-right", MoveToNextWordBoundary, Some("Editor")),
+ Binding::new("alt-f", MoveToNextWordBoundary, Some("Editor")),
+ Binding::new("cmd-left", MoveToBeginningOfLine, Some("Editor")),
+ Binding::new("ctrl-a", MoveToBeginningOfLine, Some("Editor")),
+ Binding::new("cmd-right", MoveToEndOfLine, Some("Editor")),
+ Binding::new("ctrl-e", MoveToEndOfLine, Some("Editor")),
+ Binding::new("cmd-up", MoveToBeginning, Some("Editor")),
+ Binding::new("cmd-down", MoveToEnd, Some("Editor")),
+ Binding::new("shift-up", SelectUp, Some("Editor")),
+ Binding::new("ctrl-shift-P", SelectUp, Some("Editor")),
+ Binding::new("shift-down", SelectDown, Some("Editor")),
+ Binding::new("ctrl-shift-N", SelectDown, Some("Editor")),
+ Binding::new("shift-left", SelectLeft, Some("Editor")),
+ Binding::new("ctrl-shift-B", SelectLeft, Some("Editor")),
+ Binding::new("shift-right", SelectRight, Some("Editor")),
+ Binding::new("ctrl-shift-F", SelectRight, Some("Editor")),
Binding::new(
"alt-shift-left",
SelectToPreviousWordBoundary,
- Some("BufferView"),
+ Some("Editor"),
),
- Binding::new(
- "alt-shift-B",
- SelectToPreviousWordBoundary,
- Some("BufferView"),
- ),
- Binding::new(
- "alt-shift-right",
- SelectToNextWordBoundary,
- Some("BufferView"),
- ),
- Binding::new("alt-shift-F", SelectToNextWordBoundary, Some("BufferView")),
+ Binding::new("alt-shift-B", SelectToPreviousWordBoundary, Some("Editor")),
+ Binding::new("alt-shift-right", SelectToNextWordBoundary, Some("Editor")),
+ Binding::new("alt-shift-F", SelectToNextWordBoundary, Some("Editor")),
Binding::new(
"cmd-shift-left",
SelectToBeginningOfLine(true),
- Some("BufferView"),
+ Some("Editor"),
),
Binding::new(
"ctrl-shift-A",
SelectToBeginningOfLine(true),
- Some("BufferView"),
+ Some("Editor"),
),
- Binding::new("cmd-shift-right", SelectToEndOfLine, Some("BufferView")),
- Binding::new("ctrl-shift-E", SelectToEndOfLine, Some("BufferView")),
- Binding::new("cmd-shift-up", SelectToBeginning, Some("BufferView")),
- Binding::new("cmd-shift-down", SelectToEnd, Some("BufferView")),
- Binding::new("cmd-a", SelectAll, Some("BufferView")),
- Binding::new("cmd-l", SelectLine, Some("BufferView")),
- Binding::new("cmd-shift-L", SplitSelectionIntoLines, Some("BufferView")),
- Binding::new("cmd-alt-up", AddSelectionAbove, Some("BufferView")),
- Binding::new("cmd-ctrl-p", AddSelectionAbove, Some("BufferView")),
- Binding::new("cmd-alt-down", AddSelectionBelow, Some("BufferView")),
- Binding::new("cmd-ctrl-n", AddSelectionBelow, Some("BufferView")),
- Binding::new("alt-up", SelectLargerSyntaxNode, Some("BufferView")),
- Binding::new("ctrl-w", SelectLargerSyntaxNode, Some("BufferView")),
- Binding::new("alt-down", SelectSmallerSyntaxNode, Some("BufferView")),
- Binding::new("ctrl-shift-W", SelectSmallerSyntaxNode, Some("BufferView")),
- Binding::new("ctrl-m", MoveToEnclosingBracket, Some("BufferView")),
- Binding::new("pageup", PageUp, Some("BufferView")),
- Binding::new("pagedown", PageDown, Some("BufferView")),
- Binding::new("alt-cmd-[", Fold, Some("BufferView")),
- Binding::new("alt-cmd-]", Unfold, Some("BufferView")),
- Binding::new("alt-cmd-f", FoldSelectedRanges, Some("BufferView")),
+ Binding::new("cmd-shift-right", SelectToEndOfLine, Some("Editor")),
+ Binding::new("ctrl-shift-E", SelectToEndOfLine, Some("Editor")),
+ Binding::new("cmd-shift-up", SelectToBeginning, Some("Editor")),
+ Binding::new("cmd-shift-down", SelectToEnd, Some("Editor")),
+ Binding::new("cmd-a", SelectAll, Some("Editor")),
+ Binding::new("cmd-l", SelectLine, Some("Editor")),
+ Binding::new("cmd-shift-L", SplitSelectionIntoLines, Some("Editor")),
+ Binding::new("cmd-alt-up", AddSelectionAbove, Some("Editor")),
+ Binding::new("cmd-ctrl-p", AddSelectionAbove, Some("Editor")),
+ Binding::new("cmd-alt-down", AddSelectionBelow, Some("Editor")),
+ Binding::new("cmd-ctrl-n", AddSelectionBelow, Some("Editor")),
+ Binding::new("alt-up", SelectLargerSyntaxNode, Some("Editor")),
+ Binding::new("ctrl-w", SelectLargerSyntaxNode, Some("Editor")),
+ Binding::new("alt-down", SelectSmallerSyntaxNode, Some("Editor")),
+ Binding::new("ctrl-shift-W", SelectSmallerSyntaxNode, Some("Editor")),
+ Binding::new("ctrl-m", MoveToEnclosingBracket, Some("Editor")),
+ Binding::new("pageup", PageUp, Some("Editor")),
+ Binding::new("pagedown", PageDown, Some("Editor")),
+ Binding::new("alt-cmd-[", Fold, Some("Editor")),
+ Binding::new("alt-cmd-]", Unfold, Some("Editor")),
+ Binding::new("alt-cmd-f", FoldSelectedRanges, Some("Editor")),
]);
cx.add_action(|this: &mut Editor, action: &Scroll, cx| this.set_scroll_position(action.0, cx));
@@ -2088,11 +2080,11 @@ impl Editor {
}
pub fn page_up(&mut self, _: &PageUp, _: &mut ViewContext<Self>) {
- log::info!("BufferView::page_up");
+ log::info!("Editor::page_up");
}
pub fn page_down(&mut self, _: &PageDown, _: &mut ViewContext<Self>) {
- log::info!("BufferView::page_down");
+ log::info!("Editor::page_down");
}
pub fn fold(&mut self, _: &Fold, cx: &mut ViewContext<Self>) {
@@ -2596,7 +2588,7 @@ impl View for Editor {
}
fn ui_name() -> &'static str {
- "BufferView"
+ "Editor"
}
fn on_focus(&mut self, cx: &mut ViewContext<Self>) {