From 5176f3deba39a0b2cc7ca035cee3f476977e2f00 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Fri, 28 May 2021 14:53:30 -0700 Subject: [PATCH] Rename context parameters to `cx` in editor.rs --- zed/src/editor.rs | 1835 ++++++++++++++++++++++----------------------- 1 file changed, 906 insertions(+), 929 deletions(-) diff --git a/zed/src/editor.rs b/zed/src/editor.rs index 08ba35d86b..328f9ff729 100644 --- a/zed/src/editor.rs +++ b/zed/src/editor.rs @@ -38,8 +38,8 @@ use std::{ const CURSOR_BLINK_INTERVAL: Duration = Duration::from_millis(500); -pub fn init(app: &mut MutableAppContext) { - app.add_bindings(vec![ +pub fn init(cx: &mut MutableAppContext) { + cx.add_bindings(vec![ Binding::new("escape", "buffer:cancel", Some("BufferView")), Binding::new("backspace", "buffer:backspace", Some("BufferView")), Binding::new("ctrl-h", "buffer:backspace", Some("BufferView")), @@ -197,104 +197,104 @@ pub fn init(app: &mut MutableAppContext) { ), ]); - app.add_action("buffer:scroll", Editor::scroll); - app.add_action("buffer:select", Editor::select); - app.add_action("buffer:cancel", Editor::cancel); - app.add_action("buffer:insert", Editor::insert); - app.add_action("buffer:newline", Editor::newline); - app.add_action("buffer:backspace", Editor::backspace); - app.add_action("buffer:delete", Editor::delete); - app.add_action("buffer:delete_line", Editor::delete_line); - app.add_action( + cx.add_action("buffer:scroll", Editor::scroll); + cx.add_action("buffer:select", Editor::select); + cx.add_action("buffer:cancel", Editor::cancel); + cx.add_action("buffer:insert", Editor::insert); + cx.add_action("buffer:newline", Editor::newline); + cx.add_action("buffer:backspace", Editor::backspace); + cx.add_action("buffer:delete", Editor::delete); + cx.add_action("buffer:delete_line", Editor::delete_line); + cx.add_action( "buffer:delete_to_previous_word_boundary", Editor::delete_to_previous_word_boundary, ); - app.add_action( + cx.add_action( "buffer:delete_to_next_word_boundary", Editor::delete_to_next_word_boundary, ); - app.add_action( + cx.add_action( "buffer:delete_to_beginning_of_line", Editor::delete_to_beginning_of_line, ); - app.add_action( + cx.add_action( "buffer:delete_to_end_of_line", Editor::delete_to_end_of_line, ); - app.add_action("buffer:duplicate_line", Editor::duplicate_line); - app.add_action("buffer:move_line_up", Editor::move_line_up); - app.add_action("buffer:move_line_down", Editor::move_line_down); - app.add_action("buffer:cut", Editor::cut); - app.add_action("buffer:copy", Editor::copy); - app.add_action("buffer:paste", Editor::paste); - app.add_action("buffer:undo", Editor::undo); - app.add_action("buffer:redo", Editor::redo); - app.add_action("buffer:move_up", Editor::move_up); - app.add_action("buffer:move_down", Editor::move_down); - app.add_action("buffer:move_left", Editor::move_left); - app.add_action("buffer:move_right", Editor::move_right); - app.add_action( + cx.add_action("buffer:duplicate_line", Editor::duplicate_line); + cx.add_action("buffer:move_line_up", Editor::move_line_up); + cx.add_action("buffer:move_line_down", Editor::move_line_down); + cx.add_action("buffer:cut", Editor::cut); + cx.add_action("buffer:copy", Editor::copy); + cx.add_action("buffer:paste", Editor::paste); + cx.add_action("buffer:undo", Editor::undo); + cx.add_action("buffer:redo", Editor::redo); + cx.add_action("buffer:move_up", Editor::move_up); + cx.add_action("buffer:move_down", Editor::move_down); + cx.add_action("buffer:move_left", Editor::move_left); + cx.add_action("buffer:move_right", Editor::move_right); + cx.add_action( "buffer:move_to_previous_word_boundary", Editor::move_to_previous_word_boundary, ); - app.add_action( + cx.add_action( "buffer:move_to_next_word_boundary", Editor::move_to_next_word_boundary, ); - app.add_action( + cx.add_action( "buffer:move_to_beginning_of_line", Editor::move_to_beginning_of_line, ); - app.add_action("buffer:move_to_end_of_line", Editor::move_to_end_of_line); - app.add_action("buffer:move_to_beginning", Editor::move_to_beginning); - app.add_action("buffer:move_to_end", Editor::move_to_end); - app.add_action("buffer:select_up", Editor::select_up); - app.add_action("buffer:select_down", Editor::select_down); - app.add_action("buffer:select_left", Editor::select_left); - app.add_action("buffer:select_right", Editor::select_right); - app.add_action( + cx.add_action("buffer:move_to_end_of_line", Editor::move_to_end_of_line); + cx.add_action("buffer:move_to_beginning", Editor::move_to_beginning); + cx.add_action("buffer:move_to_end", Editor::move_to_end); + cx.add_action("buffer:select_up", Editor::select_up); + cx.add_action("buffer:select_down", Editor::select_down); + cx.add_action("buffer:select_left", Editor::select_left); + cx.add_action("buffer:select_right", Editor::select_right); + cx.add_action( "buffer:select_to_previous_word_boundary", Editor::select_to_previous_word_boundary, ); - app.add_action( + cx.add_action( "buffer:select_to_next_word_boundary", Editor::select_to_next_word_boundary, ); - app.add_action( + cx.add_action( "buffer:select_to_beginning_of_line", Editor::select_to_beginning_of_line, ); - app.add_action( + cx.add_action( "buffer:select_to_end_of_line", Editor::select_to_end_of_line, ); - app.add_action("buffer:select_to_beginning", Editor::select_to_beginning); - app.add_action("buffer:select_to_end", Editor::select_to_end); - app.add_action("buffer:select_all", Editor::select_all); - app.add_action("buffer:select_line", Editor::select_line); - app.add_action( + cx.add_action("buffer:select_to_beginning", Editor::select_to_beginning); + cx.add_action("buffer:select_to_end", Editor::select_to_end); + cx.add_action("buffer:select_all", Editor::select_all); + cx.add_action("buffer:select_line", Editor::select_line); + cx.add_action( "buffer:split_selection_into_lines", Editor::split_selection_into_lines, ); - app.add_action("buffer:add_selection_above", Editor::add_selection_above); - app.add_action("buffer:add_selection_below", Editor::add_selection_below); - app.add_action( + cx.add_action("buffer:add_selection_above", Editor::add_selection_above); + cx.add_action("buffer:add_selection_below", Editor::add_selection_below); + cx.add_action( "buffer:select_larger_syntax_node", Editor::select_larger_syntax_node, ); - app.add_action( + cx.add_action( "buffer:select_smaller_syntax_node", Editor::select_smaller_syntax_node, ); - app.add_action( + cx.add_action( "buffer:move_to_enclosing_bracket", Editor::move_to_enclosing_bracket, ); - app.add_action("buffer:page_up", Editor::page_up); - app.add_action("buffer:page_down", Editor::page_down); - app.add_action("buffer:fold", Editor::fold); - app.add_action("buffer:unfold", Editor::unfold); - app.add_action("buffer:fold_selected_ranges", Editor::fold_selected_ranges); + cx.add_action("buffer:page_up", Editor::page_up); + cx.add_action("buffer:page_down", Editor::page_down); + cx.add_action("buffer:fold", Editor::fold); + cx.add_action("buffer:unfold", Editor::unfold); + cx.add_action("buffer:fold_selected_ranges", Editor::fold_selected_ranges); } pub enum SelectAction { @@ -340,9 +340,9 @@ struct ClipboardSelection { } impl Editor { - pub fn single_line(settings: watch::Receiver, ctx: &mut ViewContext) -> Self { - let buffer = ctx.add_model(|ctx| Buffer::new(0, String::new(), ctx)); - let mut view = Self::for_buffer(buffer, settings, ctx); + pub fn single_line(settings: watch::Receiver, cx: &mut ViewContext) -> Self { + let buffer = cx.add_model(|cx| Buffer::new(0, String::new(), cx)); + let mut view = Self::for_buffer(buffer, settings, cx); view.single_line = true; view } @@ -350,14 +350,14 @@ impl Editor { pub fn for_buffer( buffer: ModelHandle, settings: watch::Receiver, - ctx: &mut ViewContext, + cx: &mut ViewContext, ) -> Self { - ctx.observe_model(&buffer, Self::on_buffer_changed); - ctx.subscribe_to_model(&buffer, Self::on_buffer_event); - let display_map = DisplayMap::new(buffer.clone(), settings.borrow().tab_size, ctx.as_ref()); + cx.observe_model(&buffer, Self::on_buffer_changed); + cx.subscribe_to_model(&buffer, Self::on_buffer_event); + let display_map = DisplayMap::new(buffer.clone(), settings.borrow().tab_size, cx.as_ref()); let mut next_selection_id = 0; - let (selection_set_id, _) = buffer.update(ctx, |buffer, ctx| { + let (selection_set_id, _) = buffer.update(cx, |buffer, cx| { buffer.add_selection_set( vec![Selection { id: post_inc(&mut next_selection_id), @@ -366,11 +366,11 @@ impl Editor { reversed: false, goal: SelectionGoal::None, }], - Some(ctx), + Some(cx), ) }); Self { - handle: ctx.handle().downgrade(), + handle: cx.handle().downgrade(), buffer, display_map, selection_set_id, @@ -397,9 +397,9 @@ impl Editor { !self.single_line } - fn scroll(&mut self, scroll_position: &Vector2F, ctx: &mut ViewContext) { + fn scroll(&mut self, scroll_position: &Vector2F, cx: &mut ViewContext) { *self.scroll_position.lock() = *scroll_position; - ctx.notify(); + cx.notify(); } pub fn scroll_position(&self) -> Vector2F { @@ -416,11 +416,11 @@ impl Editor { &self, viewport_height: f32, line_height: f32, - app: &AppContext, + cx: &AppContext, ) -> bool { let mut scroll_position = self.scroll_position.lock(); let scroll_top = scroll_position.y(); - scroll_position.set_y(scroll_top.min(self.max_point(app).row().saturating_sub(1) as f32)); + scroll_position.set_y(scroll_top.min(self.max_point(cx).row().saturating_sub(1) as f32)); let mut autoscroll_requested = self.autoscroll_requested.lock(); if *autoscroll_requested { @@ -431,18 +431,18 @@ impl Editor { let visible_lines = viewport_height / line_height; let first_cursor_top = self - .selections(app) + .selections(cx) .first() .unwrap() .head() - .to_display_point(&self.display_map, app) + .to_display_point(&self.display_map, cx) .row() as f32; let last_cursor_bottom = self - .selections(app) + .selections(cx) .last() .unwrap() .head() - .to_display_point(&self.display_map, app) + .to_display_point(&self.display_map, cx) .row() as f32 + 1.0; @@ -474,17 +474,14 @@ impl Editor { scroll_width: f32, max_glyph_width: f32, layouts: &[text_layout::Line], - ctx: &AppContext, + cx: &AppContext, ) { let mut target_left = std::f32::INFINITY; let mut target_right = 0.0_f32; - for selection in self.selections(ctx) { - let head = selection.head().to_display_point(&self.display_map, ctx); + for selection in self.selections(cx) { + let head = selection.head().to_display_point(&self.display_map, cx); let start_column = head.column().saturating_sub(3); - let end_column = cmp::min( - self.display_map.line_len(head.row(), ctx), - head.column() + 3, - ); + let end_column = cmp::min(self.display_map.line_len(head.row(), cx), head.column() + 3); target_left = target_left .min(layouts[(head.row() - start_row) as usize].x_for_index(start_column as usize)); target_right = target_right.max( @@ -509,26 +506,26 @@ impl Editor { } } - fn select(&mut self, arg: &SelectAction, ctx: &mut ViewContext) { + fn select(&mut self, arg: &SelectAction, cx: &mut ViewContext) { match arg { - SelectAction::Begin { position, add } => self.begin_selection(*position, *add, ctx), + SelectAction::Begin { position, add } => self.begin_selection(*position, *add, cx), SelectAction::Update { position, scroll_position, - } => self.update_selection(*position, *scroll_position, ctx), - SelectAction::End => self.end_selection(ctx), + } => self.update_selection(*position, *scroll_position, cx), + SelectAction::End => self.end_selection(cx), } } - fn begin_selection(&mut self, position: DisplayPoint, add: bool, ctx: &mut ViewContext) { + fn begin_selection(&mut self, position: DisplayPoint, add: bool, cx: &mut ViewContext) { if !self.focused { - ctx.focus_self(); - ctx.emit(Event::Activate); + cx.focus_self(); + cx.emit(Event::Activate); } let cursor = self .display_map - .anchor_before(position, Bias::Left, ctx.as_ref()); + .anchor_before(position, Bias::Left, cx.as_ref()); let selection = Selection { id: post_inc(&mut self.next_selection_id), start: cursor.clone(), @@ -538,23 +535,23 @@ impl Editor { }; if !add { - self.update_selections(Vec::new(), false, ctx); + self.update_selections(Vec::new(), false, cx); } self.pending_selection = Some(selection); - ctx.notify(); + cx.notify(); } fn update_selection( &mut self, position: DisplayPoint, scroll_position: Vector2F, - ctx: &mut ViewContext, + cx: &mut ViewContext, ) { - let buffer = self.buffer.read(ctx); + let buffer = self.buffer.read(cx); let cursor = self .display_map - .anchor_before(position, Bias::Left, ctx.as_ref()); + .anchor_before(position, Bias::Left, cx.as_ref()); if let Some(selection) = self.pending_selection.as_mut() { selection.set_head(buffer, cursor); } else { @@ -564,15 +561,15 @@ impl Editor { *self.scroll_position.lock() = scroll_position; - ctx.notify(); + cx.notify(); } - fn end_selection(&mut self, ctx: &mut ViewContext) { + fn end_selection(&mut self, cx: &mut ViewContext) { if let Some(selection) = self.pending_selection.take() { - let ix = self.selection_insertion_index(&selection.start, ctx.as_ref()); - let mut selections = self.selections(ctx.as_ref()).to_vec(); + let ix = self.selection_insertion_index(&selection.start, cx.as_ref()); + let mut selections = self.selections(cx.as_ref()).to_vec(); selections.insert(ix, selection); - self.update_selections(selections, false, ctx); + self.update_selections(selections, false, cx); } else { log::error!("end_selection dispatched with no pending selection"); } @@ -582,11 +579,11 @@ impl Editor { self.pending_selection.is_some() } - pub fn cancel(&mut self, _: &(), ctx: &mut ViewContext) { - let selections = self.selections(ctx.as_ref()); + pub fn cancel(&mut self, _: &(), cx: &mut ViewContext) { + let selections = self.selections(cx.as_ref()); if let Some(pending_selection) = self.pending_selection.take() { if selections.is_empty() { - self.update_selections(vec![pending_selection], true, ctx); + self.update_selections(vec![pending_selection], true, cx); } } else { let mut oldest_selection = selections.iter().min_by_key(|s| s.id).unwrap().clone(); @@ -594,16 +591,16 @@ impl Editor { oldest_selection.start = oldest_selection.head().clone(); oldest_selection.end = oldest_selection.head().clone(); } - self.update_selections(vec![oldest_selection], true, ctx); + self.update_selections(vec![oldest_selection], true, cx); } } - fn select_ranges(&mut self, ranges: I, autoscroll: bool, ctx: &mut ViewContext) + fn select_ranges(&mut self, ranges: I, autoscroll: bool, cx: &mut ViewContext) where I: IntoIterator>, T: ToOffset, { - let buffer = self.buffer.read(ctx); + let buffer = self.buffer.read(cx); let mut selections = Vec::new(); for range in ranges { let mut start = range.start.to_offset(buffer); @@ -622,11 +619,11 @@ impl Editor { goal: SelectionGoal::None, }); } - self.update_selections(selections, autoscroll, ctx); + self.update_selections(selections, autoscroll, cx); } #[cfg(test)] - fn select_display_ranges<'a, T>(&mut self, ranges: T, ctx: &mut ViewContext) -> Result<()> + fn select_display_ranges<'a, T>(&mut self, ranges: T, cx: &mut ViewContext) -> Result<()> where T: IntoIterator>, { @@ -645,34 +642,32 @@ impl Editor { id: post_inc(&mut self.next_selection_id), start: self .display_map - .anchor_before(start, Bias::Left, ctx.as_ref()), - end: self - .display_map - .anchor_before(end, Bias::Left, ctx.as_ref()), + .anchor_before(start, Bias::Left, cx.as_ref()), + end: self.display_map.anchor_before(end, Bias::Left, cx.as_ref()), reversed, goal: SelectionGoal::None, }); } - self.update_selections(selections, false, ctx); + self.update_selections(selections, false, cx); Ok(()) } - pub fn insert(&mut self, text: &String, ctx: &mut ViewContext) { + pub fn insert(&mut self, text: &String, cx: &mut ViewContext) { let mut old_selections = SmallVec::<[_; 32]>::new(); { - let buffer = self.buffer.read(ctx); - for selection in self.selections(ctx.as_ref()) { + let buffer = self.buffer.read(cx); + for selection in self.selections(cx.as_ref()) { let start = selection.start.to_offset(buffer); let end = selection.end.to_offset(buffer); old_selections.push((selection.id, start..end)); } } - self.start_transaction(ctx); + self.start_transaction(cx); let mut new_selections = Vec::new(); - self.buffer.update(ctx, |buffer, ctx| { + self.buffer.update(cx, |buffer, cx| { let edit_ranges = old_selections.iter().map(|(_, range)| range.clone()); - if let Err(error) = buffer.edit(edit_ranges, text.as_str(), Some(ctx)) { + if let Err(error) = buffer.edit(edit_ranges, text.as_str(), Some(cx)) { log::error!("error inserting text: {}", error); }; let text_len = text.len() as isize; @@ -696,33 +691,33 @@ impl Editor { .collect(); }); - self.update_selections(new_selections, true, ctx); - self.end_transaction(ctx); + self.update_selections(new_selections, true, cx); + self.end_transaction(cx); } - fn newline(&mut self, _: &(), ctx: &mut ViewContext) { + fn newline(&mut self, _: &(), cx: &mut ViewContext) { if self.single_line { - ctx.propagate_action(); + cx.propagate_action(); } else { - self.insert(&"\n".into(), ctx); + self.insert(&"\n".into(), cx); } } - pub fn backspace(&mut self, _: &(), ctx: &mut ViewContext) { - self.start_transaction(ctx); - let mut selections = self.selections(ctx.as_ref()).to_vec(); + pub fn backspace(&mut self, _: &(), cx: &mut ViewContext) { + self.start_transaction(cx); + let mut selections = self.selections(cx.as_ref()).to_vec(); { - let buffer = self.buffer.read(ctx); + let buffer = self.buffer.read(cx); for selection in &mut selections { let range = selection.point_range(buffer); if range.start == range.end { let head = selection .head() - .to_display_point(&self.display_map, ctx.as_ref()); + .to_display_point(&self.display_map, cx.as_ref()); let cursor = self.display_map.anchor_before( - movement::left(&self.display_map, head, ctx.as_ref()).unwrap(), + movement::left(&self.display_map, head, cx.as_ref()).unwrap(), Bias::Left, - ctx.as_ref(), + cx.as_ref(), ); selection.set_head(&buffer, cursor); selection.goal = SelectionGoal::None; @@ -730,26 +725,26 @@ impl Editor { } } - self.update_selections(selections, true, ctx); - self.insert(&String::new(), ctx); - self.end_transaction(ctx); + self.update_selections(selections, true, cx); + self.insert(&String::new(), cx); + self.end_transaction(cx); } - pub fn delete(&mut self, _: &(), ctx: &mut ViewContext) { - self.start_transaction(ctx); - let mut selections = self.selections(ctx.as_ref()).to_vec(); + pub fn delete(&mut self, _: &(), cx: &mut ViewContext) { + self.start_transaction(cx); + let mut selections = self.selections(cx.as_ref()).to_vec(); { - let buffer = self.buffer.read(ctx); + let buffer = self.buffer.read(cx); for selection in &mut selections { let range = selection.point_range(buffer); if range.start == range.end { let head = selection .head() - .to_display_point(&self.display_map, ctx.as_ref()); + .to_display_point(&self.display_map, cx.as_ref()); let cursor = self.display_map.anchor_before( - movement::right(&self.display_map, head, ctx.as_ref()).unwrap(), + movement::right(&self.display_map, head, cx.as_ref()).unwrap(), Bias::Right, - ctx.as_ref(), + cx.as_ref(), ); selection.set_head(&buffer, cursor); selection.goal = SelectionGoal::None; @@ -757,15 +752,15 @@ impl Editor { } } - self.update_selections(selections, true, ctx); - self.insert(&String::new(), ctx); - self.end_transaction(ctx); + self.update_selections(selections, true, cx); + self.insert(&String::new(), cx); + self.end_transaction(cx); } - pub fn delete_line(&mut self, _: &(), ctx: &mut ViewContext) { - self.start_transaction(ctx); + pub fn delete_line(&mut self, _: &(), cx: &mut ViewContext) { + self.start_transaction(cx); - let app = ctx.as_ref(); + let app = cx.as_ref(); let buffer = self.buffer.read(app); let mut new_cursors = Vec::new(); @@ -837,29 +832,29 @@ impl Editor { }) .collect(); self.buffer - .update(ctx, |buffer, ctx| buffer.edit(edit_ranges, "", Some(ctx))) + .update(cx, |buffer, cx| buffer.edit(edit_ranges, "", Some(cx))) .unwrap(); - self.update_selections(new_selections, true, ctx); - self.end_transaction(ctx); + self.update_selections(new_selections, true, cx); + self.end_transaction(cx); } - pub fn duplicate_line(&mut self, _: &(), ctx: &mut ViewContext) { - self.start_transaction(ctx); + pub fn duplicate_line(&mut self, _: &(), cx: &mut ViewContext) { + self.start_transaction(cx); - let mut selections = self.selections(ctx.as_ref()).to_vec(); + let mut selections = self.selections(cx.as_ref()).to_vec(); { // Temporarily bias selections right to allow newly duplicate lines to push them down // when the selections are at the beginning of a line. - let buffer = self.buffer.read(ctx); + let buffer = self.buffer.read(cx); for selection in &mut selections { selection.start = selection.start.bias_right(buffer); selection.end = selection.end.bias_right(buffer); } } - self.update_selections(selections.clone(), false, ctx); + self.update_selections(selections.clone(), false, cx); - let app = ctx.as_ref(); - let buffer = self.buffer.read(ctx); + let app = cx.as_ref(); + let buffer = self.buffer.read(cx); let mut edits = Vec::new(); let mut selections_iter = selections.iter_mut().peekable(); @@ -888,28 +883,28 @@ impl Editor { edits.push((start, text)); } - self.buffer.update(ctx, |buffer, ctx| { + self.buffer.update(cx, |buffer, cx| { for (offset, text) in edits.into_iter().rev() { - buffer.edit(Some(offset..offset), text, Some(ctx)).unwrap(); + buffer.edit(Some(offset..offset), text, Some(cx)).unwrap(); } }); // Restore bias on selections. - let buffer = self.buffer.read(ctx); + let buffer = self.buffer.read(cx); for selection in &mut selections { selection.start = selection.start.bias_left(buffer); selection.end = selection.end.bias_left(buffer); } - self.update_selections(selections, true, ctx); + self.update_selections(selections, true, cx); - self.end_transaction(ctx); + self.end_transaction(cx); } - pub fn move_line_up(&mut self, _: &(), ctx: &mut ViewContext) { - self.start_transaction(ctx); + pub fn move_line_up(&mut self, _: &(), cx: &mut ViewContext) { + self.start_transaction(cx); - let app = ctx.as_ref(); - let buffer = self.buffer.read(ctx); + let app = cx.as_ref(); + let buffer = self.buffer.read(cx); let mut edits = Vec::new(); let mut new_selection_ranges = Vec::new(); @@ -977,23 +972,23 @@ impl Editor { new_selection_ranges.extend(contiguous_selections.drain(..)); } - self.unfold_ranges(old_folds, ctx); - self.buffer.update(ctx, |buffer, ctx| { + self.unfold_ranges(old_folds, cx); + self.buffer.update(cx, |buffer, cx| { for (range, text) in edits.into_iter().rev() { - buffer.edit(Some(range), text, Some(ctx)).unwrap(); + buffer.edit(Some(range), text, Some(cx)).unwrap(); } }); - self.fold_ranges(new_folds, ctx); - self.select_ranges(new_selection_ranges, true, ctx); + self.fold_ranges(new_folds, cx); + self.select_ranges(new_selection_ranges, true, cx); - self.end_transaction(ctx); + self.end_transaction(cx); } - pub fn move_line_down(&mut self, _: &(), ctx: &mut ViewContext) { - self.start_transaction(ctx); + pub fn move_line_down(&mut self, _: &(), cx: &mut ViewContext) { + self.start_transaction(cx); - let app = ctx.as_ref(); - let buffer = self.buffer.read(ctx); + let app = cx.as_ref(); + let buffer = self.buffer.read(cx); let mut edits = Vec::new(); let mut new_selection_ranges = Vec::new(); @@ -1065,25 +1060,25 @@ impl Editor { new_selection_ranges.extend(contiguous_selections.drain(..)); } - self.unfold_ranges(old_folds, ctx); - self.buffer.update(ctx, |buffer, ctx| { + self.unfold_ranges(old_folds, cx); + self.buffer.update(cx, |buffer, cx| { for (range, text) in edits.into_iter().rev() { - buffer.edit(Some(range), text, Some(ctx)).unwrap(); + buffer.edit(Some(range), text, Some(cx)).unwrap(); } }); - self.fold_ranges(new_folds, ctx); - self.select_ranges(new_selection_ranges, true, ctx); + self.fold_ranges(new_folds, cx); + self.select_ranges(new_selection_ranges, true, cx); - self.end_transaction(ctx); + self.end_transaction(cx); } - pub fn cut(&mut self, _: &(), ctx: &mut ViewContext) { - self.start_transaction(ctx); + pub fn cut(&mut self, _: &(), cx: &mut ViewContext) { + self.start_transaction(cx); let mut text = String::new(); - let mut selections = self.selections(ctx.as_ref()).to_vec(); + let mut selections = self.selections(cx.as_ref()).to_vec(); let mut clipboard_selections = Vec::with_capacity(selections.len()); { - let buffer = self.buffer.read(ctx); + let buffer = self.buffer.read(cx); let max_point = buffer.max_point(); for selection in &mut selections { let mut start = selection.start.to_point(buffer); @@ -1106,19 +1101,19 @@ impl Editor { }); } } - self.update_selections(selections, true, ctx); - self.insert(&String::new(), ctx); - self.end_transaction(ctx); + self.update_selections(selections, true, cx); + self.insert(&String::new(), cx); + self.end_transaction(cx); - ctx.as_mut() + cx.as_mut() .write_to_clipboard(ClipboardItem::new(text).with_metadata(clipboard_selections)); } - pub fn copy(&mut self, _: &(), ctx: &mut ViewContext) { - let buffer = self.buffer.read(ctx); + pub fn copy(&mut self, _: &(), cx: &mut ViewContext) { + let buffer = self.buffer.read(cx); let max_point = buffer.max_point(); let mut text = String::new(); - let selections = self.selections(ctx.as_ref()); + let selections = self.selections(cx.as_ref()); let mut clipboard_selections = Vec::with_capacity(selections.len()); for selection in selections { let mut start = selection.start.to_point(buffer); @@ -1139,15 +1134,15 @@ impl Editor { }); } - ctx.as_mut() + cx.as_mut() .write_to_clipboard(ClipboardItem::new(text).with_metadata(clipboard_selections)); } - pub fn paste(&mut self, _: &(), ctx: &mut ViewContext) { - if let Some(item) = ctx.as_mut().read_from_clipboard() { + pub fn paste(&mut self, _: &(), cx: &mut ViewContext) { + if let Some(item) = cx.as_mut().read_from_clipboard() { let clipboard_text = item.text(); if let Some(mut clipboard_selections) = item.metadata::>() { - let selections = self.selections(ctx.as_ref()).to_vec(); + let selections = self.selections(cx.as_ref()).to_vec(); if clipboard_selections.len() != selections.len() { let merged_selection = ClipboardSelection { len: clipboard_selections.iter().map(|s| s.len).sum(), @@ -1157,7 +1152,7 @@ impl Editor { clipboard_selections.push(merged_selection); } - self.start_transaction(ctx); + self.start_transaction(cx); let mut new_selections = Vec::with_capacity(selections.len()); let mut clipboard_chars = clipboard_text.chars().cycle(); for (selection, clipboard_selection) in @@ -1166,7 +1161,7 @@ impl Editor { let to_insert = String::from_iter(clipboard_chars.by_ref().take(clipboard_selection.len)); - self.buffer.update(ctx, |buffer, ctx| { + self.buffer.update(cx, |buffer, cx| { let selection_start = selection.start.to_point(buffer); let selection_end = selection.end.to_point(buffer); @@ -1178,11 +1173,11 @@ impl Editor { if selection_start == selection_end && clipboard_selection.is_entire_line { let line_start = Point::new(selection_start.row, 0); buffer - .edit(Some(line_start..line_start), to_insert, Some(ctx)) + .edit(Some(line_start..line_start), to_insert, Some(cx)) .unwrap(); } else { buffer - .edit(Some(&selection.start..&selection.end), to_insert, Some(ctx)) + .edit(Some(&selection.start..&selection.end), to_insert, Some(cx)) .unwrap(); }; @@ -1196,26 +1191,24 @@ impl Editor { }); }); } - self.update_selections(new_selections, true, ctx); - self.end_transaction(ctx); + self.update_selections(new_selections, true, cx); + self.end_transaction(cx); } else { - self.insert(clipboard_text, ctx); + self.insert(clipboard_text, cx); } } } - pub fn undo(&mut self, _: &(), ctx: &mut ViewContext) { - self.buffer - .update(ctx, |buffer, ctx| buffer.undo(Some(ctx))); + pub fn undo(&mut self, _: &(), cx: &mut ViewContext) { + self.buffer.update(cx, |buffer, cx| buffer.undo(Some(cx))); } - pub fn redo(&mut self, _: &(), ctx: &mut ViewContext) { - self.buffer - .update(ctx, |buffer, ctx| buffer.redo(Some(ctx))); + pub fn redo(&mut self, _: &(), cx: &mut ViewContext) { + self.buffer.update(cx, |buffer, cx| buffer.redo(Some(cx))); } - pub fn move_left(&mut self, _: &(), ctx: &mut ViewContext) { - let app = ctx.as_ref(); + pub fn move_left(&mut self, _: &(), cx: &mut ViewContext) { + let app = cx.as_ref(); let mut selections = self.selections(app).to_vec(); { for selection in &mut selections { @@ -1237,33 +1230,33 @@ impl Editor { selection.goal = SelectionGoal::None; } } - self.update_selections(selections, true, ctx); + self.update_selections(selections, true, cx); } - pub fn select_left(&mut self, _: &(), ctx: &mut ViewContext) { - let mut selections = self.selections(ctx.as_ref()).to_vec(); + pub fn select_left(&mut self, _: &(), cx: &mut ViewContext) { + let mut selections = self.selections(cx.as_ref()).to_vec(); { - let buffer = self.buffer.read(ctx); + let buffer = self.buffer.read(cx); for selection in &mut selections { let head = selection .head() - .to_display_point(&self.display_map, ctx.as_ref()); + .to_display_point(&self.display_map, cx.as_ref()); let cursor = self.display_map.anchor_before( - movement::left(&self.display_map, head, ctx.as_ref()).unwrap(), + movement::left(&self.display_map, head, cx.as_ref()).unwrap(), Bias::Left, - ctx.as_ref(), + cx.as_ref(), ); selection.set_head(&buffer, cursor); selection.goal = SelectionGoal::None; } } - self.update_selections(selections, true, ctx); + self.update_selections(selections, true, cx); } - pub fn move_right(&mut self, _: &(), ctx: &mut ViewContext) { - let mut selections = self.selections(ctx.as_ref()).to_vec(); + pub fn move_right(&mut self, _: &(), cx: &mut ViewContext) { + let mut selections = self.selections(cx.as_ref()).to_vec(); { - let app = ctx.as_ref(); + let app = cx.as_ref(); for selection in &mut selections { let start = selection.start.to_display_point(&self.display_map, app); let end = selection.end.to_display_point(&self.display_map, app); @@ -1283,18 +1276,18 @@ impl Editor { selection.goal = SelectionGoal::None; } } - self.update_selections(selections, true, ctx); + self.update_selections(selections, true, cx); } - pub fn select_right(&mut self, _: &(), ctx: &mut ViewContext) { - let mut selections = self.selections(ctx.as_ref()).to_vec(); + pub fn select_right(&mut self, _: &(), cx: &mut ViewContext) { + let mut selections = self.selections(cx.as_ref()).to_vec(); { - let app = ctx.as_ref(); + let app = cx.as_ref(); let buffer = self.buffer.read(app); for selection in &mut selections { let head = selection .head() - .to_display_point(&self.display_map, ctx.as_ref()); + .to_display_point(&self.display_map, cx.as_ref()); let cursor = self.display_map.anchor_before( movement::right(&self.display_map, head, app).unwrap(), Bias::Right, @@ -1304,16 +1297,16 @@ impl Editor { selection.goal = SelectionGoal::None; } } - self.update_selections(selections, true, ctx); + self.update_selections(selections, true, cx); } - pub fn move_up(&mut self, _: &(), ctx: &mut ViewContext) { + pub fn move_up(&mut self, _: &(), cx: &mut ViewContext) { if self.single_line { - ctx.propagate_action(); + cx.propagate_action(); } else { - let mut selections = self.selections(ctx.as_ref()).to_vec(); + let mut selections = self.selections(cx.as_ref()).to_vec(); { - let app = ctx.as_ref(); + let app = cx.as_ref(); for selection in &mut selections { let start = selection.start.to_display_point(&self.display_map, app); let end = selection.end.to_display_point(&self.display_map, app); @@ -1330,14 +1323,14 @@ impl Editor { selection.reversed = false; } } - self.update_selections(selections, true, ctx); + self.update_selections(selections, true, cx); } } - pub fn select_up(&mut self, _: &(), ctx: &mut ViewContext) { - let mut selections = self.selections(ctx.as_ref()).to_vec(); + pub fn select_up(&mut self, _: &(), cx: &mut ViewContext) { + let mut selections = self.selections(cx.as_ref()).to_vec(); { - let app = ctx.as_ref(); + let app = cx.as_ref(); let buffer = self.buffer.read(app); for selection in &mut selections { let head = selection.head().to_display_point(&self.display_map, app); @@ -1350,16 +1343,16 @@ impl Editor { selection.goal = goal; } } - self.update_selections(selections, true, ctx); + self.update_selections(selections, true, cx); } - pub fn move_down(&mut self, _: &(), ctx: &mut ViewContext) { + pub fn move_down(&mut self, _: &(), cx: &mut ViewContext) { if self.single_line { - ctx.propagate_action(); + cx.propagate_action(); } else { - let mut selections = self.selections(ctx.as_ref()).to_vec(); + let mut selections = self.selections(cx.as_ref()).to_vec(); { - let app = ctx.as_ref(); + let app = cx.as_ref(); for selection in &mut selections { let start = selection.start.to_display_point(&self.display_map, app); let end = selection.end.to_display_point(&self.display_map, app); @@ -1376,14 +1369,14 @@ impl Editor { selection.reversed = false; } } - self.update_selections(selections, true, ctx); + self.update_selections(selections, true, cx); } } - pub fn select_down(&mut self, _: &(), ctx: &mut ViewContext) { - let mut selections = self.selections(ctx.as_ref()).to_vec(); + pub fn select_down(&mut self, _: &(), cx: &mut ViewContext) { + let mut selections = self.selections(cx.as_ref()).to_vec(); { - let app = ctx.as_ref(); + let app = cx.as_ref(); let buffer = self.buffer.read(app); for selection in &mut selections { let head = selection.head().to_display_point(&self.display_map, app); @@ -1396,11 +1389,11 @@ impl Editor { selection.goal = goal; } } - self.update_selections(selections, true, ctx); + self.update_selections(selections, true, cx); } - pub fn move_to_previous_word_boundary(&mut self, _: &(), ctx: &mut ViewContext) { - let app = ctx.as_ref(); + pub fn move_to_previous_word_boundary(&mut self, _: &(), cx: &mut ViewContext) { + let app = cx.as_ref(); let mut selections = self.selections(app).to_vec(); { for selection in &mut selections { @@ -1413,14 +1406,14 @@ impl Editor { selection.goal = SelectionGoal::None; } } - self.update_selections(selections, true, ctx); + self.update_selections(selections, true, cx); } - pub fn select_to_previous_word_boundary(&mut self, _: &(), ctx: &mut ViewContext) { - let app = ctx.as_ref(); + pub fn select_to_previous_word_boundary(&mut self, _: &(), cx: &mut ViewContext) { + let app = cx.as_ref(); let mut selections = self.selections(app).to_vec(); { - let buffer = self.buffer.read(ctx); + let buffer = self.buffer.read(cx); for selection in &mut selections { let head = selection.head().to_display_point(&self.display_map, app); let new_head = movement::prev_word_boundary(&self.display_map, head, app).unwrap(); @@ -1429,18 +1422,18 @@ impl Editor { selection.goal = SelectionGoal::None; } } - self.update_selections(selections, true, ctx); + self.update_selections(selections, true, cx); } - pub fn delete_to_previous_word_boundary(&mut self, _: &(), ctx: &mut ViewContext) { - self.start_transaction(ctx); - self.select_to_previous_word_boundary(&(), ctx); - self.backspace(&(), ctx); - self.end_transaction(ctx); + pub fn delete_to_previous_word_boundary(&mut self, _: &(), cx: &mut ViewContext) { + self.start_transaction(cx); + self.select_to_previous_word_boundary(&(), cx); + self.backspace(&(), cx); + self.end_transaction(cx); } - pub fn move_to_next_word_boundary(&mut self, _: &(), ctx: &mut ViewContext) { - let app = ctx.as_ref(); + pub fn move_to_next_word_boundary(&mut self, _: &(), cx: &mut ViewContext) { + let app = cx.as_ref(); let mut selections = self.selections(app).to_vec(); { for selection in &mut selections { @@ -1453,14 +1446,14 @@ impl Editor { selection.goal = SelectionGoal::None; } } - self.update_selections(selections, true, ctx); + self.update_selections(selections, true, cx); } - pub fn select_to_next_word_boundary(&mut self, _: &(), ctx: &mut ViewContext) { - let app = ctx.as_ref(); + pub fn select_to_next_word_boundary(&mut self, _: &(), cx: &mut ViewContext) { + let app = cx.as_ref(); let mut selections = self.selections(app).to_vec(); { - let buffer = self.buffer.read(ctx); + let buffer = self.buffer.read(cx); for selection in &mut selections { let head = selection.head().to_display_point(&self.display_map, app); let new_head = movement::next_word_boundary(&self.display_map, head, app).unwrap(); @@ -1469,18 +1462,18 @@ impl Editor { selection.goal = SelectionGoal::None; } } - self.update_selections(selections, true, ctx); + self.update_selections(selections, true, cx); } - pub fn delete_to_next_word_boundary(&mut self, _: &(), ctx: &mut ViewContext) { - self.start_transaction(ctx); - self.select_to_next_word_boundary(&(), ctx); - self.delete(&(), ctx); - self.end_transaction(ctx); + pub fn delete_to_next_word_boundary(&mut self, _: &(), cx: &mut ViewContext) { + self.start_transaction(cx); + self.select_to_next_word_boundary(&(), cx); + self.delete(&(), cx); + self.end_transaction(cx); } - pub fn move_to_beginning_of_line(&mut self, _: &(), ctx: &mut ViewContext) { - let app = ctx.as_ref(); + pub fn move_to_beginning_of_line(&mut self, _: &(), cx: &mut ViewContext) { + let app = cx.as_ref(); let mut selections = self.selections(app).to_vec(); { for selection in &mut selections { @@ -1494,18 +1487,18 @@ impl Editor { selection.goal = SelectionGoal::None; } } - self.update_selections(selections, true, ctx); + self.update_selections(selections, true, cx); } pub fn select_to_beginning_of_line( &mut self, toggle_indent: &bool, - ctx: &mut ViewContext, + cx: &mut ViewContext, ) { - let app = ctx.as_ref(); + let app = cx.as_ref(); let mut selections = self.selections(app).to_vec(); { - let buffer = self.buffer.read(ctx); + let buffer = self.buffer.read(cx); for selection in &mut selections { let head = selection.head().to_display_point(&self.display_map, app); let new_head = @@ -1515,18 +1508,18 @@ impl Editor { selection.goal = SelectionGoal::None; } } - self.update_selections(selections, true, ctx); + self.update_selections(selections, true, cx); } - pub fn delete_to_beginning_of_line(&mut self, _: &(), ctx: &mut ViewContext) { - self.start_transaction(ctx); - self.select_to_beginning_of_line(&false, ctx); - self.backspace(&(), ctx); - self.end_transaction(ctx); + pub fn delete_to_beginning_of_line(&mut self, _: &(), cx: &mut ViewContext) { + self.start_transaction(cx); + self.select_to_beginning_of_line(&false, cx); + self.backspace(&(), cx); + self.end_transaction(cx); } - pub fn move_to_end_of_line(&mut self, _: &(), ctx: &mut ViewContext) { - let app = ctx.as_ref(); + pub fn move_to_end_of_line(&mut self, _: &(), cx: &mut ViewContext) { + let app = cx.as_ref(); let mut selections = self.selections(app).to_vec(); { for selection in &mut selections { @@ -1539,14 +1532,14 @@ impl Editor { selection.goal = SelectionGoal::None; } } - self.update_selections(selections, true, ctx); + self.update_selections(selections, true, cx); } - pub fn select_to_end_of_line(&mut self, _: &(), ctx: &mut ViewContext) { - let app = ctx.as_ref(); + pub fn select_to_end_of_line(&mut self, _: &(), cx: &mut ViewContext) { + let app = cx.as_ref(); let mut selections = self.selections(app).to_vec(); { - let buffer = self.buffer.read(ctx); + let buffer = self.buffer.read(cx); for selection in &mut selections { let head = selection.head().to_display_point(&self.display_map, app); let new_head = movement::line_end(&self.display_map, head, app).unwrap(); @@ -1555,18 +1548,18 @@ impl Editor { selection.goal = SelectionGoal::None; } } - self.update_selections(selections, true, ctx); + self.update_selections(selections, true, cx); } - pub fn delete_to_end_of_line(&mut self, _: &(), ctx: &mut ViewContext) { - self.start_transaction(ctx); - self.select_to_end_of_line(&(), ctx); - self.delete(&(), ctx); - self.end_transaction(ctx); + pub fn delete_to_end_of_line(&mut self, _: &(), cx: &mut ViewContext) { + self.start_transaction(cx); + self.select_to_end_of_line(&(), cx); + self.delete(&(), cx); + self.end_transaction(cx); } - pub fn move_to_beginning(&mut self, _: &(), ctx: &mut ViewContext) { - let buffer = self.buffer.read(ctx); + pub fn move_to_beginning(&mut self, _: &(), cx: &mut ViewContext) { + let buffer = self.buffer.read(cx); let cursor = buffer.anchor_before(Point::new(0, 0)); let selection = Selection { id: post_inc(&mut self.next_selection_id), @@ -1575,17 +1568,17 @@ impl Editor { reversed: false, goal: SelectionGoal::None, }; - self.update_selections(vec![selection], true, ctx); + self.update_selections(vec![selection], true, cx); } - pub fn select_to_beginning(&mut self, _: &(), ctx: &mut ViewContext) { - let mut selection = self.selections(ctx.as_ref()).last().unwrap().clone(); - selection.set_head(self.buffer.read(ctx), Anchor::Start); - self.update_selections(vec![selection], true, ctx); + pub fn select_to_beginning(&mut self, _: &(), cx: &mut ViewContext) { + let mut selection = self.selections(cx.as_ref()).last().unwrap().clone(); + selection.set_head(self.buffer.read(cx), Anchor::Start); + self.update_selections(vec![selection], true, cx); } - pub fn move_to_end(&mut self, _: &(), ctx: &mut ViewContext) { - let buffer = self.buffer.read(ctx); + pub fn move_to_end(&mut self, _: &(), cx: &mut ViewContext) { + let buffer = self.buffer.read(cx); let cursor = buffer.anchor_before(buffer.max_point()); let selection = Selection { id: post_inc(&mut self.next_selection_id), @@ -1594,16 +1587,16 @@ impl Editor { reversed: false, goal: SelectionGoal::None, }; - self.update_selections(vec![selection], true, ctx); + self.update_selections(vec![selection], true, cx); } - pub fn select_to_end(&mut self, _: &(), ctx: &mut ViewContext) { - let mut selection = self.selections(ctx.as_ref()).last().unwrap().clone(); - selection.set_head(self.buffer.read(ctx), Anchor::End); - self.update_selections(vec![selection], true, ctx); + pub fn select_to_end(&mut self, _: &(), cx: &mut ViewContext) { + let mut selection = self.selections(cx.as_ref()).last().unwrap().clone(); + selection.set_head(self.buffer.read(cx), Anchor::End); + self.update_selections(vec![selection], true, cx); } - pub fn select_all(&mut self, _: &(), ctx: &mut ViewContext) { + pub fn select_all(&mut self, _: &(), cx: &mut ViewContext) { let selection = Selection { id: post_inc(&mut self.next_selection_id), start: Anchor::Start, @@ -1611,11 +1604,11 @@ impl Editor { reversed: false, goal: SelectionGoal::None, }; - self.update_selections(vec![selection], false, ctx); + self.update_selections(vec![selection], false, cx); } - pub fn select_line(&mut self, _: &(), ctx: &mut ViewContext) { - let app = ctx.as_ref(); + pub fn select_line(&mut self, _: &(), cx: &mut ViewContext) { + let app = cx.as_ref(); let buffer = self.buffer.read(app); let mut selections = self.selections(app).to_vec(); let max_point = buffer.max_point(); @@ -1625,11 +1618,11 @@ impl Editor { selection.end = buffer.anchor_before(cmp::min(max_point, Point::new(rows.end, 0))); selection.reversed = false; } - self.update_selections(selections, true, ctx); + self.update_selections(selections, true, cx); } - pub fn split_selection_into_lines(&mut self, _: &(), ctx: &mut ViewContext) { - let app = ctx.as_ref(); + pub fn split_selection_into_lines(&mut self, _: &(), cx: &mut ViewContext) { + let app = cx.as_ref(); let buffer = self.buffer.read(app); let mut to_unfold = Vec::new(); @@ -1664,20 +1657,20 @@ impl Editor { }); to_unfold.push(range); } - self.unfold_ranges(to_unfold, ctx); - self.update_selections(new_selections, true, ctx); + self.unfold_ranges(to_unfold, cx); + self.update_selections(new_selections, true, cx); } - pub fn add_selection_above(&mut self, _: &(), ctx: &mut ViewContext) { - self.add_selection(true, ctx); + pub fn add_selection_above(&mut self, _: &(), cx: &mut ViewContext) { + self.add_selection(true, cx); } - pub fn add_selection_below(&mut self, _: &(), ctx: &mut ViewContext) { - self.add_selection(false, ctx); + pub fn add_selection_below(&mut self, _: &(), cx: &mut ViewContext) { + self.add_selection(false, cx); } - fn add_selection(&mut self, above: bool, ctx: &mut ViewContext) { - let app = ctx.as_ref(); + fn add_selection(&mut self, above: bool, cx: &mut ViewContext) { + let app = cx.as_ref(); let mut selections = self.selections(app).to_vec(); let mut state = self.add_selections_state.take().unwrap_or_else(|| { @@ -1760,14 +1753,14 @@ impl Editor { state.stack.pop(); } - self.update_selections(new_selections, true, ctx); + self.update_selections(new_selections, true, cx); if state.stack.len() > 1 { self.add_selections_state = Some(state); } } - pub fn select_larger_syntax_node(&mut self, _: &(), ctx: &mut ViewContext) { - let app = ctx.as_ref(); + pub fn select_larger_syntax_node(&mut self, _: &(), cx: &mut ViewContext) { + let app = cx.as_ref(); let buffer = self.buffer.read(app); let mut stack = mem::take(&mut self.select_larger_syntax_node_stack); @@ -1798,22 +1791,22 @@ impl Editor { if selected_larger_node { stack.push(old_selections); - self.update_selections(new_selections, true, ctx); + self.update_selections(new_selections, true, cx); } self.select_larger_syntax_node_stack = stack; } - pub fn select_smaller_syntax_node(&mut self, _: &(), ctx: &mut ViewContext) { + pub fn select_smaller_syntax_node(&mut self, _: &(), cx: &mut ViewContext) { let mut stack = mem::take(&mut self.select_larger_syntax_node_stack); if let Some(selections) = stack.pop() { - self.update_selections(selections, true, ctx); + self.update_selections(selections, true, cx); } self.select_larger_syntax_node_stack = stack; } - pub fn move_to_enclosing_bracket(&mut self, _: &(), ctx: &mut ViewContext) { - let buffer = self.buffer.read(ctx.as_ref()); - let mut selections = self.selections(ctx.as_ref()).to_vec(); + pub fn move_to_enclosing_bracket(&mut self, _: &(), cx: &mut ViewContext) { + let buffer = self.buffer.read(cx.as_ref()); + let mut selections = self.selections(cx.as_ref()).to_vec(); for selection in &mut selections { let selection_range = selection.offset_range(buffer); if let Some((open_range, close_range)) = @@ -1832,7 +1825,7 @@ impl Editor { } } - self.update_selections(selections, true, ctx); + self.update_selections(selections, true, cx); } fn build_columnar_selection( @@ -1840,17 +1833,17 @@ impl Editor { row: u32, columns: &Range, reversed: bool, - ctx: &AppContext, + cx: &AppContext, ) -> Option { let is_empty = columns.start == columns.end; - let line_len = self.display_map.line_len(row, ctx); + let line_len = self.display_map.line_len(row, cx); if columns.start < line_len || (is_empty && columns.start == line_len) { let start = DisplayPoint::new(row, columns.start); let end = DisplayPoint::new(row, cmp::min(columns.end, line_len)); Some(Selection { id: post_inc(&mut self.next_selection_id), - start: self.display_map.anchor_before(start, Bias::Left, ctx), - end: self.display_map.anchor_before(end, Bias::Left, ctx), + start: self.display_map.anchor_before(start, Bias::Left, cx), + end: self.display_map.anchor_before(end, Bias::Left, cx), reversed, goal: SelectionGoal::ColumnRange { start: columns.start, @@ -1865,28 +1858,28 @@ impl Editor { pub fn selections_in_range<'a>( &'a self, range: Range, - app: &'a AppContext, + cx: &'a AppContext, ) -> impl 'a + Iterator> { - let start = self.display_map.anchor_before(range.start, Bias::Left, app); - let start_index = self.selection_insertion_index(&start, app); + let start = self.display_map.anchor_before(range.start, Bias::Left, cx); + let start_index = self.selection_insertion_index(&start, cx); let pending_selection = self.pending_selection.as_ref().and_then(|s| { - let selection_range = s.display_range(&self.display_map, app); + let selection_range = s.display_range(&self.display_map, cx); if selection_range.start <= range.end || selection_range.end <= range.end { Some(selection_range) } else { None } }); - self.selections(app)[start_index..] + self.selections(cx)[start_index..] .iter() - .map(move |s| s.display_range(&self.display_map, app)) + .map(move |s| s.display_range(&self.display_map, cx)) .take_while(move |r| r.start <= range.end || r.end <= range.end) .chain(pending_selection) } - fn selection_insertion_index(&self, start: &Anchor, app: &AppContext) -> usize { - let buffer = self.buffer.read(app); - let selections = self.selections(app); + fn selection_insertion_index(&self, start: &Anchor, cx: &AppContext) -> usize { + let buffer = self.buffer.read(cx); + let selections = self.selections(cx); match selections.binary_search_by(|probe| probe.start.cmp(&start, buffer).unwrap()) { Ok(index) => index, Err(index) => { @@ -1901,9 +1894,9 @@ impl Editor { } } - fn selections<'a>(&self, app: &'a AppContext) -> &'a [Selection] { + fn selections<'a>(&self, cx: &'a AppContext) -> &'a [Selection] { self.buffer - .read(app) + .read(cx) .selections(self.selection_set_id) .unwrap() } @@ -1912,10 +1905,10 @@ impl Editor { &mut self, mut selections: Vec, autoscroll: bool, - ctx: &mut ViewContext, + cx: &mut ViewContext, ) { // Merge overlapping selections. - let buffer = self.buffer.read(ctx); + let buffer = self.buffer.read(cx); let mut i = 1; while i < selections.len() { if selections[i - 1] @@ -1936,34 +1929,34 @@ impl Editor { } } - self.buffer.update(ctx, |buffer, ctx| { + self.buffer.update(cx, |buffer, cx| { buffer - .update_selection_set(self.selection_set_id, selections, Some(ctx)) + .update_selection_set(self.selection_set_id, selections, Some(cx)) .unwrap() }); - self.pause_cursor_blinking(ctx); + self.pause_cursor_blinking(cx); if autoscroll { *self.autoscroll_requested.lock() = true; - ctx.notify(); + cx.notify(); } self.add_selections_state = None; self.select_larger_syntax_node_stack.clear(); } - fn start_transaction(&self, ctx: &mut ViewContext) { - self.buffer.update(ctx, |buffer, _| { + fn start_transaction(&self, cx: &mut ViewContext) { + self.buffer.update(cx, |buffer, _| { buffer .start_transaction(Some(self.selection_set_id)) .unwrap() }); } - fn end_transaction(&self, ctx: &mut ViewContext) { - self.buffer.update(ctx, |buffer, ctx| { + fn end_transaction(&self, cx: &mut ViewContext) { + self.buffer.update(cx, |buffer, cx| { buffer - .end_transaction(Some(self.selection_set_id), Some(ctx)) + .end_transaction(Some(self.selection_set_id), Some(cx)) .unwrap() }); } @@ -1976,10 +1969,10 @@ impl Editor { log::info!("BufferView::page_down"); } - pub fn fold(&mut self, _: &(), ctx: &mut ViewContext) { + pub fn fold(&mut self, _: &(), cx: &mut ViewContext) { let mut fold_ranges = Vec::new(); - let app = ctx.as_ref(); + let app = cx.as_ref(); for selection in self.selections(app) { let range = selection.display_range(&self.display_map, app).sorted(); let buffer_start_row = range @@ -1989,7 +1982,7 @@ impl Editor { for row in (0..=range.end.row()).rev() { if self.is_line_foldable(row, app) - && !self.display_map.is_line_folded(row, ctx.as_ref()) + && !self.display_map.is_line_folded(row, cx.as_ref()) { let fold_range = self.foldable_range_for_line(row, app); if fold_range.end.row >= buffer_start_row { @@ -2002,11 +1995,11 @@ impl Editor { } } - self.fold_ranges(fold_ranges, ctx); + self.fold_ranges(fold_ranges, cx); } - pub fn unfold(&mut self, _: &(), ctx: &mut ViewContext) { - let app = ctx.as_ref(); + pub fn unfold(&mut self, _: &(), cx: &mut ViewContext) { + let app = cx.as_ref(); let buffer = self.buffer.read(app); let ranges = self .selections(app) @@ -2024,20 +2017,20 @@ impl Editor { start..end }) .collect::>(); - self.unfold_ranges(ranges, ctx); + self.unfold_ranges(ranges, cx); } - fn is_line_foldable(&self, display_row: u32, app: &AppContext) -> bool { - let max_point = self.max_point(app); + fn is_line_foldable(&self, display_row: u32, cx: &AppContext) -> bool { + let max_point = self.max_point(cx); if display_row >= max_point.row() { false } else { - let (start_indent, is_blank) = self.display_map.line_indent(display_row, app); + let (start_indent, is_blank) = self.display_map.line_indent(display_row, cx); if is_blank { false } else { for display_row in display_row + 1..=max_point.row() { - let (indent, is_blank) = self.display_map.line_indent(display_row, app); + let (indent, is_blank) = self.display_map.line_indent(display_row, cx); if !is_blank { return indent > start_indent; } @@ -2047,69 +2040,69 @@ impl Editor { } } - fn foldable_range_for_line(&self, start_row: u32, app: &AppContext) -> Range { - let max_point = self.max_point(app); + fn foldable_range_for_line(&self, start_row: u32, cx: &AppContext) -> Range { + let max_point = self.max_point(cx); - let (start_indent, _) = self.display_map.line_indent(start_row, app); - let start = DisplayPoint::new(start_row, self.line_len(start_row, app)); + let (start_indent, _) = self.display_map.line_indent(start_row, cx); + let start = DisplayPoint::new(start_row, self.line_len(start_row, cx)); let mut end = None; for row in start_row + 1..=max_point.row() { - let (indent, is_blank) = self.display_map.line_indent(row, app); + let (indent, is_blank) = self.display_map.line_indent(row, cx); if !is_blank && indent <= start_indent { - end = Some(DisplayPoint::new(row - 1, self.line_len(row - 1, app))); + end = Some(DisplayPoint::new(row - 1, self.line_len(row - 1, cx))); break; } } let end = end.unwrap_or(max_point); - return start.to_buffer_point(&self.display_map, Bias::Left, app) - ..end.to_buffer_point(&self.display_map, Bias::Left, app); + return start.to_buffer_point(&self.display_map, Bias::Left, cx) + ..end.to_buffer_point(&self.display_map, Bias::Left, cx); } - pub fn fold_selected_ranges(&mut self, _: &(), ctx: &mut ViewContext) { - let buffer = self.buffer.read(ctx); + pub fn fold_selected_ranges(&mut self, _: &(), cx: &mut ViewContext) { + let buffer = self.buffer.read(cx); let ranges = self - .selections(ctx.as_ref()) + .selections(cx.as_ref()) .iter() .map(|s| s.point_range(buffer).sorted()) .collect(); - self.fold_ranges(ranges, ctx); + self.fold_ranges(ranges, cx); } - fn fold_ranges(&mut self, ranges: Vec>, ctx: &mut ViewContext) { + fn fold_ranges(&mut self, ranges: Vec>, cx: &mut ViewContext) { if !ranges.is_empty() { - self.display_map.fold(ranges, ctx.as_ref()); + self.display_map.fold(ranges, cx.as_ref()); *self.autoscroll_requested.lock() = true; - ctx.notify(); + cx.notify(); } } - fn unfold_ranges(&mut self, ranges: Vec>, ctx: &mut ViewContext) { + fn unfold_ranges(&mut self, ranges: Vec>, cx: &mut ViewContext) { if !ranges.is_empty() { - self.display_map.unfold(ranges, ctx.as_ref()); + self.display_map.unfold(ranges, cx.as_ref()); *self.autoscroll_requested.lock() = true; - ctx.notify(); + cx.notify(); } } - pub fn line(&self, display_row: u32, ctx: &AppContext) -> String { - self.display_map.line(display_row, ctx) + pub fn line(&self, display_row: u32, cx: &AppContext) -> String { + self.display_map.line(display_row, cx) } - pub fn line_len(&self, display_row: u32, ctx: &AppContext) -> u32 { - self.display_map.line_len(display_row, ctx) + pub fn line_len(&self, display_row: u32, cx: &AppContext) -> u32 { + self.display_map.line_len(display_row, cx) } - pub fn longest_row(&self, ctx: &AppContext) -> u32 { - self.display_map.longest_row(ctx) + pub fn longest_row(&self, cx: &AppContext) -> u32 { + self.display_map.longest_row(cx) } - pub fn max_point(&self, ctx: &AppContext) -> DisplayPoint { - self.display_map.max_point(ctx) + pub fn max_point(&self, cx: &AppContext) -> DisplayPoint { + self.display_map.max_point(cx) } - pub fn text(&self, ctx: &AppContext) -> String { - self.display_map.text(ctx) + pub fn text(&self, cx: &AppContext) -> String { + self.display_map.text(cx) } pub fn font_size(&self) -> f32 { @@ -2147,13 +2140,13 @@ impl Editor { &self, font_cache: &FontCache, layout_cache: &TextLayoutCache, - app: &AppContext, + cx: &AppContext, ) -> Result { let settings = self.settings.borrow(); let font_size = settings.buffer_font_size; let font_id = font_cache.select_font(settings.buffer_font_family, &FontProperties::new())?; - let digit_count = (self.buffer.read(app).row_count() as f32).log10().floor() as usize + 1; + let digit_count = (self.buffer.read(cx).row_count() as f32).log10().floor() as usize + 1; Ok(layout_cache .layout_str( @@ -2169,7 +2162,7 @@ impl Editor { viewport_height: f32, font_cache: &FontCache, layout_cache: &TextLayoutCache, - ctx: &AppContext, + cx: &AppContext, ) -> Result> { let settings = self.settings.borrow(); let font_size = settings.buffer_font_size; @@ -2178,7 +2171,7 @@ impl Editor { let start_row = self.scroll_position().y() as usize; let end_row = cmp::min( - self.max_point(ctx).row() as usize, + self.max_point(cx).row() as usize, start_row + (viewport_height / self.line_height(font_cache)).ceil() as usize, ); let line_count = end_row - start_row + 1; @@ -2187,7 +2180,7 @@ impl Editor { let mut line_number = String::new(); for buffer_row in self .display_map - .snapshot(ctx) + .snapshot(cx) .buffer_rows(start_row as u32) .take(line_count) { @@ -2208,9 +2201,9 @@ impl Editor { mut rows: Range, font_cache: &FontCache, layout_cache: &TextLayoutCache, - ctx: &AppContext, + cx: &AppContext, ) -> Result> { - rows.end = cmp::min(rows.end, self.display_map.max_point(ctx).row() + 1); + rows.end = cmp::min(rows.end, self.display_map.max_point(cx).row() + 1); if rows.start >= rows.end { return Ok(Vec::new()); } @@ -2227,7 +2220,7 @@ impl Editor { let mut line = String::new(); let mut styles = Vec::new(); let mut row = rows.start; - let mut snapshot = self.display_map.snapshot(ctx); + let mut snapshot = self.display_map.snapshot(cx); let chunks = snapshot.highlighted_chunks_for_rows(rows.clone()); let theme = settings.theme.clone(); @@ -2267,18 +2260,18 @@ impl Editor { row: u32, font_cache: &FontCache, layout_cache: &TextLayoutCache, - app: &AppContext, + cx: &AppContext, ) -> Result { let settings = self.settings.borrow(); let font_id = font_cache.select_font(settings.buffer_font_family, &FontProperties::new())?; - let line = self.line(row, app); + let line = self.line(row, cx); Ok(layout_cache.layout_str( &line, settings.buffer_font_size, - &[(self.line_len(row, app) as usize, font_id, ColorU::black())], + &[(self.line_len(row, cx) as usize, font_id, ColorU::black())], )) } @@ -2287,36 +2280,36 @@ impl Editor { self.blink_epoch } - fn pause_cursor_blinking(&mut self, ctx: &mut ViewContext) { + fn pause_cursor_blinking(&mut self, cx: &mut ViewContext) { self.cursors_visible = true; - ctx.notify(); + cx.notify(); let epoch = self.next_blink_epoch(); - ctx.spawn(|this, mut ctx| async move { + cx.spawn(|this, mut cx| async move { Timer::after(CURSOR_BLINK_INTERVAL).await; - this.update(&mut ctx, |this, ctx| { - this.resume_cursor_blinking(epoch, ctx); + this.update(&mut cx, |this, cx| { + this.resume_cursor_blinking(epoch, cx); }) }) .detach(); } - fn resume_cursor_blinking(&mut self, epoch: usize, ctx: &mut ViewContext) { + fn resume_cursor_blinking(&mut self, epoch: usize, cx: &mut ViewContext) { if epoch == self.blink_epoch { self.blinking_paused = false; - self.blink_cursors(epoch, ctx); + self.blink_cursors(epoch, cx); } } - fn blink_cursors(&mut self, epoch: usize, ctx: &mut ViewContext) { + fn blink_cursors(&mut self, epoch: usize, cx: &mut ViewContext) { if epoch == self.blink_epoch && self.focused && !self.blinking_paused { self.cursors_visible = !self.cursors_visible; - ctx.notify(); + cx.notify(); let epoch = self.next_blink_epoch(); - ctx.spawn(|this, mut ctx| async move { + cx.spawn(|this, mut cx| async move { Timer::after(CURSOR_BLINK_INTERVAL).await; - this.update(&mut ctx, |this, ctx| this.blink_cursors(epoch, ctx)); + this.update(&mut cx, |this, cx| this.blink_cursors(epoch, cx)); }) .detach(); } @@ -2326,22 +2319,22 @@ impl Editor { self.cursors_visible } - fn on_buffer_changed(&mut self, _: ModelHandle, ctx: &mut ViewContext) { - ctx.notify(); + fn on_buffer_changed(&mut self, _: ModelHandle, cx: &mut ViewContext) { + cx.notify(); } fn on_buffer_event( &mut self, _: ModelHandle, event: &buffer::Event, - ctx: &mut ViewContext, + cx: &mut ViewContext, ) { match event { - buffer::Event::Edited => ctx.emit(Event::Edited), - buffer::Event::Dirtied => ctx.emit(Event::Dirtied), - buffer::Event::Saved => ctx.emit(Event::Saved), - buffer::Event::FileHandleChanged => ctx.emit(Event::FileHandleChanged), - buffer::Event::Reloaded => ctx.emit(Event::FileHandleChanged), + buffer::Event::Edited => cx.emit(Event::Edited), + buffer::Event::Dirtied => cx.emit(Event::Dirtied), + buffer::Event::Saved => cx.emit(Event::Saved), + buffer::Event::FileHandleChanged => cx.emit(Event::FileHandleChanged), + buffer::Event::Reloaded => cx.emit(Event::FileHandleChanged), buffer::Event::Reparsed => {} } } @@ -2369,16 +2362,16 @@ impl View for Editor { "BufferView" } - fn on_focus(&mut self, ctx: &mut ViewContext) { + fn on_focus(&mut self, cx: &mut ViewContext) { self.focused = true; - self.blink_cursors(self.blink_epoch, ctx); + self.blink_cursors(self.blink_epoch, cx); } - fn on_blur(&mut self, ctx: &mut ViewContext) { + fn on_blur(&mut self, cx: &mut ViewContext) { self.focused = false; self.cursors_visible = false; - ctx.emit(Event::Blurred); - ctx.notify(); + cx.emit(Event::Blurred); + cx.notify(); } } @@ -2392,9 +2385,9 @@ impl workspace::Item for Buffer { fn build_view( handle: ModelHandle, settings: watch::Receiver, - ctx: &mut ViewContext, + cx: &mut ViewContext, ) -> Self::View { - Editor::for_buffer(handle, settings, ctx) + Editor::for_buffer(handle, settings, cx) } } @@ -2410,12 +2403,12 @@ impl workspace::ItemView for Editor { ) } - fn title(&self, app: &AppContext) -> std::string::String { + fn title(&self, cx: &AppContext) -> std::string::String { let filename = self .buffer - .read(app) + .read(cx) .file() - .and_then(|file| file.file_name(app)); + .and_then(|file| file.file_name(cx)); if let Some(name) = filename { name.to_string_lossy().into() } else { @@ -2423,15 +2416,15 @@ impl workspace::ItemView for Editor { } } - fn entry_id(&self, ctx: &AppContext) -> Option<(usize, Arc)> { - self.buffer.read(ctx).file().map(|file| file.entry_id()) + fn entry_id(&self, cx: &AppContext) -> Option<(usize, Arc)> { + self.buffer.read(cx).file().map(|file| file.entry_id()) } - fn clone_on_split(&self, ctx: &mut ViewContext) -> Option + fn clone_on_split(&self, cx: &mut ViewContext) -> Option where Self: Sized, { - let clone = Editor::for_buffer(self.buffer.clone(), self.settings.clone(), ctx); + let clone = Editor::for_buffer(self.buffer.clone(), self.settings.clone(), cx); *clone.scroll_position.lock() = *self.scroll_position.lock(); Some(clone) } @@ -2439,17 +2432,17 @@ impl workspace::ItemView for Editor { fn save( &mut self, new_file: Option, - ctx: &mut ViewContext, + cx: &mut ViewContext, ) -> Task> { - self.buffer.update(ctx, |b, ctx| b.save(new_file, ctx)) + self.buffer.update(cx, |b, cx| b.save(new_file, cx)) } - fn is_dirty(&self, ctx: &AppContext) -> bool { - self.buffer.read(ctx).is_dirty() + fn is_dirty(&self, cx: &AppContext) -> bool { + self.buffer.read(cx).is_dirty() } - fn has_conflict(&self, ctx: &AppContext) -> bool { - self.buffer.read(ctx).has_conflict() + fn has_conflict(&self, cx: &AppContext) -> bool { + self.buffer.read(cx).has_conflict() } } @@ -2465,20 +2458,20 @@ mod tests { use unindent::Unindent; #[gpui::test] - fn test_selection_with_mouse(app: &mut gpui::MutableAppContext) { - let buffer = app.add_model(|ctx| Buffer::new(0, "aaaaaa\nbbbbbb\ncccccc\ndddddd\n", ctx)); - let settings = settings::channel(&app.font_cache()).unwrap().1; - let (_, buffer_view) = app.add_window(|ctx| Editor::for_buffer(buffer, settings, ctx)); + fn test_selection_with_mouse(cx: &mut gpui::MutableAppContext) { + let buffer = cx.add_model(|cx| Buffer::new(0, "aaaaaa\nbbbbbb\ncccccc\ndddddd\n", cx)); + let settings = settings::channel(&cx.font_cache()).unwrap().1; + let (_, buffer_view) = cx.add_window(|cx| Editor::for_buffer(buffer, settings, cx)); - buffer_view.update(app, |view, ctx| { - view.begin_selection(DisplayPoint::new(2, 2), false, ctx); + buffer_view.update(cx, |view, cx| { + view.begin_selection(DisplayPoint::new(2, 2), false, cx); }); - let view = buffer_view.read(app); + let view = buffer_view.read(cx); let selections = view .selections_in_range( - DisplayPoint::zero()..view.max_point(app.as_ref()), - app.as_ref(), + DisplayPoint::zero()..view.max_point(cx.as_ref()), + cx.as_ref(), ) .collect::>(); assert_eq!( @@ -2486,15 +2479,15 @@ mod tests { [DisplayPoint::new(2, 2)..DisplayPoint::new(2, 2)] ); - buffer_view.update(app, |view, ctx| { - view.update_selection(DisplayPoint::new(3, 3), Vector2F::zero(), ctx); + buffer_view.update(cx, |view, cx| { + view.update_selection(DisplayPoint::new(3, 3), Vector2F::zero(), cx); }); - let view = buffer_view.read(app); + let view = buffer_view.read(cx); let selections = view .selections_in_range( - DisplayPoint::zero()..view.max_point(app.as_ref()), - app.as_ref(), + DisplayPoint::zero()..view.max_point(cx.as_ref()), + cx.as_ref(), ) .collect::>(); assert_eq!( @@ -2502,15 +2495,15 @@ mod tests { [DisplayPoint::new(2, 2)..DisplayPoint::new(3, 3)] ); - buffer_view.update(app, |view, ctx| { - view.update_selection(DisplayPoint::new(1, 1), Vector2F::zero(), ctx); + buffer_view.update(cx, |view, cx| { + view.update_selection(DisplayPoint::new(1, 1), Vector2F::zero(), cx); }); - let view = buffer_view.read(app); + let view = buffer_view.read(cx); let selections = view .selections_in_range( - DisplayPoint::zero()..view.max_point(app.as_ref()), - app.as_ref(), + DisplayPoint::zero()..view.max_point(cx.as_ref()), + cx.as_ref(), ) .collect::>(); assert_eq!( @@ -2518,16 +2511,16 @@ mod tests { [DisplayPoint::new(2, 2)..DisplayPoint::new(1, 1)] ); - buffer_view.update(app, |view, ctx| { - view.end_selection(ctx); - view.update_selection(DisplayPoint::new(3, 3), Vector2F::zero(), ctx); + buffer_view.update(cx, |view, cx| { + view.end_selection(cx); + view.update_selection(DisplayPoint::new(3, 3), Vector2F::zero(), cx); }); - let view = buffer_view.read(app); + let view = buffer_view.read(cx); let selections = view .selections_in_range( - DisplayPoint::zero()..view.max_point(app.as_ref()), - app.as_ref(), + DisplayPoint::zero()..view.max_point(cx.as_ref()), + cx.as_ref(), ) .collect::>(); assert_eq!( @@ -2535,16 +2528,16 @@ mod tests { [DisplayPoint::new(2, 2)..DisplayPoint::new(1, 1)] ); - buffer_view.update(app, |view, ctx| { - view.begin_selection(DisplayPoint::new(3, 3), true, ctx); - view.update_selection(DisplayPoint::new(0, 0), Vector2F::zero(), ctx); + buffer_view.update(cx, |view, cx| { + view.begin_selection(DisplayPoint::new(3, 3), true, cx); + view.update_selection(DisplayPoint::new(0, 0), Vector2F::zero(), cx); }); - let view = buffer_view.read(app); + let view = buffer_view.read(cx); let selections = view .selections_in_range( - DisplayPoint::zero()..view.max_point(app.as_ref()), - app.as_ref(), + DisplayPoint::zero()..view.max_point(cx.as_ref()), + cx.as_ref(), ) .collect::>(); assert_eq!( @@ -2555,15 +2548,15 @@ mod tests { ] ); - buffer_view.update(app, |view, ctx| { - view.end_selection(ctx); + buffer_view.update(cx, |view, cx| { + view.end_selection(cx); }); - let view = buffer_view.read(app); + let view = buffer_view.read(cx); let selections = view .selections_in_range( - DisplayPoint::zero()..view.max_point(app.as_ref()), - app.as_ref(), + DisplayPoint::zero()..view.max_point(cx.as_ref()), + cx.as_ref(), ) .collect::>(); assert_eq!( @@ -2573,93 +2566,93 @@ mod tests { } #[gpui::test] - fn test_canceling_pending_selection(app: &mut gpui::MutableAppContext) { - let buffer = app.add_model(|ctx| Buffer::new(0, "aaaaaa\nbbbbbb\ncccccc\ndddddd\n", ctx)); - let settings = settings::channel(&app.font_cache()).unwrap().1; - let (_, view) = app.add_window(|ctx| Editor::for_buffer(buffer, settings, ctx)); + fn test_canceling_pending_selection(cx: &mut gpui::MutableAppContext) { + let buffer = cx.add_model(|cx| Buffer::new(0, "aaaaaa\nbbbbbb\ncccccc\ndddddd\n", cx)); + let settings = settings::channel(&cx.font_cache()).unwrap().1; + let (_, view) = cx.add_window(|cx| Editor::for_buffer(buffer, settings, cx)); - view.update(app, |view, ctx| { - view.begin_selection(DisplayPoint::new(2, 2), false, ctx); + view.update(cx, |view, cx| { + view.begin_selection(DisplayPoint::new(2, 2), false, cx); }); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), [DisplayPoint::new(2, 2)..DisplayPoint::new(2, 2)] ); - view.update(app, |view, ctx| { - view.update_selection(DisplayPoint::new(3, 3), Vector2F::zero(), ctx); + view.update(cx, |view, cx| { + view.update_selection(DisplayPoint::new(3, 3), Vector2F::zero(), cx); }); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), [DisplayPoint::new(2, 2)..DisplayPoint::new(3, 3)] ); - view.update(app, |view, ctx| { - view.cancel(&(), ctx); - view.update_selection(DisplayPoint::new(1, 1), Vector2F::zero(), ctx); + view.update(cx, |view, cx| { + view.cancel(&(), cx); + view.update_selection(DisplayPoint::new(1, 1), Vector2F::zero(), cx); }); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), [DisplayPoint::new(2, 2)..DisplayPoint::new(3, 3)] ); } #[gpui::test] - fn test_cancel(app: &mut gpui::MutableAppContext) { - let buffer = app.add_model(|ctx| Buffer::new(0, "aaaaaa\nbbbbbb\ncccccc\ndddddd\n", ctx)); - let settings = settings::channel(&app.font_cache()).unwrap().1; - let (_, view) = app.add_window(|ctx| Editor::for_buffer(buffer, settings, ctx)); + fn test_cancel(cx: &mut gpui::MutableAppContext) { + let buffer = cx.add_model(|cx| Buffer::new(0, "aaaaaa\nbbbbbb\ncccccc\ndddddd\n", cx)); + let settings = settings::channel(&cx.font_cache()).unwrap().1; + let (_, view) = cx.add_window(|cx| Editor::for_buffer(buffer, settings, cx)); - view.update(app, |view, ctx| { - view.begin_selection(DisplayPoint::new(3, 4), false, ctx); - view.update_selection(DisplayPoint::new(1, 1), Vector2F::zero(), ctx); - view.end_selection(ctx); + view.update(cx, |view, cx| { + view.begin_selection(DisplayPoint::new(3, 4), false, cx); + view.update_selection(DisplayPoint::new(1, 1), Vector2F::zero(), cx); + view.end_selection(cx); - view.begin_selection(DisplayPoint::new(0, 1), true, ctx); - view.update_selection(DisplayPoint::new(0, 3), Vector2F::zero(), ctx); - view.end_selection(ctx); + view.begin_selection(DisplayPoint::new(0, 1), true, cx); + view.update_selection(DisplayPoint::new(0, 3), Vector2F::zero(), cx); + view.end_selection(cx); }); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), [ DisplayPoint::new(0, 1)..DisplayPoint::new(0, 3), DisplayPoint::new(3, 4)..DisplayPoint::new(1, 1), ] ); - view.update(app, |view, ctx| view.cancel(&(), ctx)); + view.update(cx, |view, cx| view.cancel(&(), cx)); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), [DisplayPoint::new(3, 4)..DisplayPoint::new(1, 1)] ); - view.update(app, |view, ctx| view.cancel(&(), ctx)); + view.update(cx, |view, cx| view.cancel(&(), cx)); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), [DisplayPoint::new(1, 1)..DisplayPoint::new(1, 1)] ); } #[gpui::test] - fn test_layout_line_numbers(app: &mut gpui::MutableAppContext) { - let layout_cache = TextLayoutCache::new(app.platform().fonts()); - let font_cache = app.font_cache().clone(); + fn test_layout_line_numbers(cx: &mut gpui::MutableAppContext) { + let layout_cache = TextLayoutCache::new(cx.platform().fonts()); + let font_cache = cx.font_cache().clone(); - let buffer = app.add_model(|ctx| Buffer::new(0, sample_text(6, 6), ctx)); + let buffer = cx.add_model(|cx| Buffer::new(0, sample_text(6, 6), cx)); let settings = settings::channel(&font_cache).unwrap().1; - let (_, view) = app.add_window(|ctx| Editor::for_buffer(buffer.clone(), settings, ctx)); + let (_, view) = cx.add_window(|cx| Editor::for_buffer(buffer.clone(), settings, cx)); let layouts = view - .read(app) - .layout_line_numbers(1000.0, &font_cache, &layout_cache, app.as_ref()) + .read(cx) + .layout_line_numbers(1000.0, &font_cache, &layout_cache, cx.as_ref()) .unwrap(); assert_eq!(layouts.len(), 6); } #[gpui::test] - fn test_fold(app: &mut gpui::MutableAppContext) { - let buffer = app.add_model(|ctx| { + fn test_fold(cx: &mut gpui::MutableAppContext) { + let buffer = cx.add_model(|cx| { Buffer::new( 0, " @@ -2680,18 +2673,18 @@ mod tests { } " .unindent(), - ctx, + cx, ) }); - let settings = settings::channel(&app.font_cache()).unwrap().1; - let (_, view) = app.add_window(|ctx| Editor::for_buffer(buffer.clone(), settings, ctx)); + let settings = settings::channel(&cx.font_cache()).unwrap().1; + let (_, view) = cx.add_window(|cx| Editor::for_buffer(buffer.clone(), settings, cx)); - view.update(app, |view, ctx| { - view.select_display_ranges(&[DisplayPoint::new(8, 0)..DisplayPoint::new(12, 0)], ctx) + view.update(cx, |view, cx| { + view.select_display_ranges(&[DisplayPoint::new(8, 0)..DisplayPoint::new(12, 0)], cx) .unwrap(); - view.fold(&(), ctx); + view.fold(&(), cx); assert_eq!( - view.text(ctx.as_ref()), + view.text(cx.as_ref()), " impl Foo { // Hello! @@ -2710,9 +2703,9 @@ mod tests { .unindent(), ); - view.fold(&(), ctx); + view.fold(&(), cx); assert_eq!( - view.text(ctx.as_ref()), + view.text(cx.as_ref()), " impl Foo {… } @@ -2720,9 +2713,9 @@ mod tests { .unindent(), ); - view.unfold(&(), ctx); + view.unfold(&(), cx); assert_eq!( - view.text(ctx.as_ref()), + view.text(cx.as_ref()), " impl Foo { // Hello! @@ -2741,18 +2734,18 @@ mod tests { .unindent(), ); - view.unfold(&(), ctx); - assert_eq!(view.text(ctx.as_ref()), buffer.read(ctx).text()); + view.unfold(&(), cx); + assert_eq!(view.text(cx.as_ref()), buffer.read(cx).text()); }); } #[gpui::test] - fn test_move_cursor(app: &mut gpui::MutableAppContext) { - let buffer = app.add_model(|ctx| Buffer::new(0, sample_text(6, 6), ctx)); - let settings = settings::channel(&app.font_cache()).unwrap().1; - let (_, view) = app.add_window(|ctx| Editor::for_buffer(buffer.clone(), settings, ctx)); + fn test_move_cursor(cx: &mut gpui::MutableAppContext) { + let buffer = cx.add_model(|cx| Buffer::new(0, sample_text(6, 6), cx)); + let settings = settings::channel(&cx.font_cache()).unwrap().1; + let (_, view) = cx.add_window(|cx| Editor::for_buffer(buffer.clone(), settings, cx)); - buffer.update(app, |buffer, ctx| { + buffer.update(cx, |buffer, cx| { buffer .edit( vec![ @@ -2760,263 +2753,263 @@ mod tests { Point::new(1, 1)..Point::new(1, 1), ], "\t", - Some(ctx), + Some(cx), ) .unwrap(); }); - view.update(app, |view, ctx| { + view.update(cx, |view, cx| { assert_eq!( - view.selection_ranges(ctx.as_ref()), + view.selection_ranges(cx.as_ref()), &[DisplayPoint::new(0, 0)..DisplayPoint::new(0, 0)] ); - view.move_down(&(), ctx); + view.move_down(&(), cx); assert_eq!( - view.selection_ranges(ctx.as_ref()), + view.selection_ranges(cx.as_ref()), &[DisplayPoint::new(1, 0)..DisplayPoint::new(1, 0)] ); - view.move_right(&(), ctx); + view.move_right(&(), cx); assert_eq!( - view.selection_ranges(ctx.as_ref()), + view.selection_ranges(cx.as_ref()), &[DisplayPoint::new(1, 4)..DisplayPoint::new(1, 4)] ); - view.move_left(&(), ctx); + view.move_left(&(), cx); assert_eq!( - view.selection_ranges(ctx.as_ref()), + view.selection_ranges(cx.as_ref()), &[DisplayPoint::new(1, 0)..DisplayPoint::new(1, 0)] ); - view.move_up(&(), ctx); + view.move_up(&(), cx); assert_eq!( - view.selection_ranges(ctx.as_ref()), + view.selection_ranges(cx.as_ref()), &[DisplayPoint::new(0, 0)..DisplayPoint::new(0, 0)] ); - view.move_to_end(&(), ctx); + view.move_to_end(&(), cx); assert_eq!( - view.selection_ranges(ctx.as_ref()), + view.selection_ranges(cx.as_ref()), &[DisplayPoint::new(5, 6)..DisplayPoint::new(5, 6)] ); - view.move_to_beginning(&(), ctx); + view.move_to_beginning(&(), cx); assert_eq!( - view.selection_ranges(ctx.as_ref()), + view.selection_ranges(cx.as_ref()), &[DisplayPoint::new(0, 0)..DisplayPoint::new(0, 0)] ); - view.select_display_ranges(&[DisplayPoint::new(0, 1)..DisplayPoint::new(0, 2)], ctx) + view.select_display_ranges(&[DisplayPoint::new(0, 1)..DisplayPoint::new(0, 2)], cx) .unwrap(); - view.select_to_beginning(&(), ctx); + view.select_to_beginning(&(), cx); assert_eq!( - view.selection_ranges(ctx.as_ref()), + view.selection_ranges(cx.as_ref()), &[DisplayPoint::new(0, 1)..DisplayPoint::new(0, 0)] ); - view.select_to_end(&(), ctx); + view.select_to_end(&(), cx); assert_eq!( - view.selection_ranges(ctx.as_ref()), + view.selection_ranges(cx.as_ref()), &[DisplayPoint::new(0, 1)..DisplayPoint::new(5, 6)] ); }); } #[gpui::test] - fn test_move_cursor_multibyte(app: &mut gpui::MutableAppContext) { - let buffer = app.add_model(|ctx| Buffer::new(0, "ⓐⓑⓒⓓⓔ\nabcde\nαβγδε\n", ctx)); - let settings = settings::channel(&app.font_cache()).unwrap().1; - let (_, view) = app.add_window(|ctx| Editor::for_buffer(buffer.clone(), settings, ctx)); + fn test_move_cursor_multibyte(cx: &mut gpui::MutableAppContext) { + let buffer = cx.add_model(|cx| Buffer::new(0, "ⓐⓑⓒⓓⓔ\nabcde\nαβγδε\n", cx)); + let settings = settings::channel(&cx.font_cache()).unwrap().1; + let (_, view) = cx.add_window(|cx| Editor::for_buffer(buffer.clone(), settings, cx)); assert_eq!('ⓐ'.len_utf8(), 3); assert_eq!('α'.len_utf8(), 2); - view.update(app, |view, ctx| { + view.update(cx, |view, cx| { view.fold_ranges( vec![ Point::new(0, 6)..Point::new(0, 12), Point::new(1, 2)..Point::new(1, 4), Point::new(2, 4)..Point::new(2, 8), ], - ctx, + cx, ); - assert_eq!(view.text(ctx.as_ref()), "ⓐⓑ…ⓔ\nab…e\nαβ…ε\n"); + assert_eq!(view.text(cx.as_ref()), "ⓐⓑ…ⓔ\nab…e\nαβ…ε\n"); - view.move_right(&(), ctx); + view.move_right(&(), cx); assert_eq!( - view.selection_ranges(ctx.as_ref()), + view.selection_ranges(cx.as_ref()), &[empty_range(0, "ⓐ".len())] ); - view.move_right(&(), ctx); + view.move_right(&(), cx); assert_eq!( - view.selection_ranges(ctx.as_ref()), + view.selection_ranges(cx.as_ref()), &[empty_range(0, "ⓐⓑ".len())] ); - view.move_right(&(), ctx); + view.move_right(&(), cx); assert_eq!( - view.selection_ranges(ctx.as_ref()), + view.selection_ranges(cx.as_ref()), &[empty_range(0, "ⓐⓑ…".len())] ); - view.move_down(&(), ctx); + view.move_down(&(), cx); assert_eq!( - view.selection_ranges(ctx.as_ref()), + view.selection_ranges(cx.as_ref()), &[empty_range(1, "ab…".len())] ); - view.move_left(&(), ctx); + view.move_left(&(), cx); assert_eq!( - view.selection_ranges(ctx.as_ref()), + view.selection_ranges(cx.as_ref()), &[empty_range(1, "ab".len())] ); - view.move_left(&(), ctx); + view.move_left(&(), cx); assert_eq!( - view.selection_ranges(ctx.as_ref()), + view.selection_ranges(cx.as_ref()), &[empty_range(1, "a".len())] ); - view.move_down(&(), ctx); + view.move_down(&(), cx); assert_eq!( - view.selection_ranges(ctx.as_ref()), + view.selection_ranges(cx.as_ref()), &[empty_range(2, "α".len())] ); - view.move_right(&(), ctx); + view.move_right(&(), cx); assert_eq!( - view.selection_ranges(ctx.as_ref()), + view.selection_ranges(cx.as_ref()), &[empty_range(2, "αβ".len())] ); - view.move_right(&(), ctx); + view.move_right(&(), cx); assert_eq!( - view.selection_ranges(ctx.as_ref()), + view.selection_ranges(cx.as_ref()), &[empty_range(2, "αβ…".len())] ); - view.move_right(&(), ctx); + view.move_right(&(), cx); assert_eq!( - view.selection_ranges(ctx.as_ref()), + view.selection_ranges(cx.as_ref()), &[empty_range(2, "αβ…ε".len())] ); - view.move_up(&(), ctx); + view.move_up(&(), cx); assert_eq!( - view.selection_ranges(ctx.as_ref()), + view.selection_ranges(cx.as_ref()), &[empty_range(1, "ab…e".len())] ); - view.move_up(&(), ctx); + view.move_up(&(), cx); assert_eq!( - view.selection_ranges(ctx.as_ref()), + view.selection_ranges(cx.as_ref()), &[empty_range(0, "ⓐⓑ…ⓔ".len())] ); - view.move_left(&(), ctx); + view.move_left(&(), cx); assert_eq!( - view.selection_ranges(ctx.as_ref()), + view.selection_ranges(cx.as_ref()), &[empty_range(0, "ⓐⓑ…".len())] ); - view.move_left(&(), ctx); + view.move_left(&(), cx); assert_eq!( - view.selection_ranges(ctx.as_ref()), + view.selection_ranges(cx.as_ref()), &[empty_range(0, "ⓐⓑ".len())] ); - view.move_left(&(), ctx); + view.move_left(&(), cx); assert_eq!( - view.selection_ranges(ctx.as_ref()), + view.selection_ranges(cx.as_ref()), &[empty_range(0, "ⓐ".len())] ); }); } #[gpui::test] - fn test_move_cursor_different_line_lengths(app: &mut gpui::MutableAppContext) { - let buffer = app.add_model(|ctx| Buffer::new(0, "ⓐⓑⓒⓓⓔ\nabcd\nαβγ\nabcd\nⓐⓑⓒⓓⓔ\n", ctx)); - let settings = settings::channel(&app.font_cache()).unwrap().1; - let (_, view) = app.add_window(|ctx| Editor::for_buffer(buffer.clone(), settings, ctx)); - view.update(app, |view, ctx| { - view.select_display_ranges(&[empty_range(0, "ⓐⓑⓒⓓⓔ".len())], ctx) + fn test_move_cursor_different_line_lengths(cx: &mut gpui::MutableAppContext) { + let buffer = cx.add_model(|cx| Buffer::new(0, "ⓐⓑⓒⓓⓔ\nabcd\nαβγ\nabcd\nⓐⓑⓒⓓⓔ\n", cx)); + let settings = settings::channel(&cx.font_cache()).unwrap().1; + let (_, view) = cx.add_window(|cx| Editor::for_buffer(buffer.clone(), settings, cx)); + view.update(cx, |view, cx| { + view.select_display_ranges(&[empty_range(0, "ⓐⓑⓒⓓⓔ".len())], cx) .unwrap(); - view.move_down(&(), ctx); + view.move_down(&(), cx); assert_eq!( - view.selection_ranges(ctx.as_ref()), + view.selection_ranges(cx.as_ref()), &[empty_range(1, "abcd".len())] ); - view.move_down(&(), ctx); + view.move_down(&(), cx); assert_eq!( - view.selection_ranges(ctx.as_ref()), + view.selection_ranges(cx.as_ref()), &[empty_range(2, "αβγ".len())] ); - view.move_down(&(), ctx); + view.move_down(&(), cx); assert_eq!( - view.selection_ranges(ctx.as_ref()), + view.selection_ranges(cx.as_ref()), &[empty_range(3, "abcd".len())] ); - view.move_down(&(), ctx); + view.move_down(&(), cx); assert_eq!( - view.selection_ranges(ctx.as_ref()), + view.selection_ranges(cx.as_ref()), &[empty_range(4, "ⓐⓑⓒⓓⓔ".len())] ); - view.move_up(&(), ctx); + view.move_up(&(), cx); assert_eq!( - view.selection_ranges(ctx.as_ref()), + view.selection_ranges(cx.as_ref()), &[empty_range(3, "abcd".len())] ); - view.move_up(&(), ctx); + view.move_up(&(), cx); assert_eq!( - view.selection_ranges(ctx.as_ref()), + view.selection_ranges(cx.as_ref()), &[empty_range(2, "αβγ".len())] ); }); } #[gpui::test] - fn test_beginning_end_of_line(app: &mut gpui::MutableAppContext) { - let buffer = app.add_model(|ctx| Buffer::new(0, "abc\n def", ctx)); - let settings = settings::channel(&app.font_cache()).unwrap().1; - let (_, view) = app.add_window(|ctx| Editor::for_buffer(buffer, settings, ctx)); - view.update(app, |view, ctx| { + fn test_beginning_end_of_line(cx: &mut gpui::MutableAppContext) { + let buffer = cx.add_model(|cx| Buffer::new(0, "abc\n def", cx)); + let settings = settings::channel(&cx.font_cache()).unwrap().1; + let (_, view) = cx.add_window(|cx| Editor::for_buffer(buffer, settings, cx)); + view.update(cx, |view, cx| { view.select_display_ranges( &[ DisplayPoint::new(0, 1)..DisplayPoint::new(0, 1), DisplayPoint::new(1, 4)..DisplayPoint::new(1, 4), ], - ctx, + cx, ) .unwrap(); }); - view.update(app, |view, ctx| view.move_to_beginning_of_line(&(), ctx)); + view.update(cx, |view, cx| view.move_to_beginning_of_line(&(), cx)); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), &[ DisplayPoint::new(0, 0)..DisplayPoint::new(0, 0), DisplayPoint::new(1, 2)..DisplayPoint::new(1, 2), ] ); - view.update(app, |view, ctx| view.move_to_beginning_of_line(&(), ctx)); + view.update(cx, |view, cx| view.move_to_beginning_of_line(&(), cx)); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), &[ DisplayPoint::new(0, 0)..DisplayPoint::new(0, 0), DisplayPoint::new(1, 0)..DisplayPoint::new(1, 0), ] ); - view.update(app, |view, ctx| view.move_to_beginning_of_line(&(), ctx)); + view.update(cx, |view, cx| view.move_to_beginning_of_line(&(), cx)); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), &[ DisplayPoint::new(0, 0)..DisplayPoint::new(0, 0), DisplayPoint::new(1, 2)..DisplayPoint::new(1, 2), ] ); - view.update(app, |view, ctx| view.move_to_end_of_line(&(), ctx)); + view.update(cx, |view, cx| view.move_to_end_of_line(&(), cx)); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), &[ DisplayPoint::new(0, 3)..DisplayPoint::new(0, 3), DisplayPoint::new(1, 5)..DisplayPoint::new(1, 5), @@ -3024,72 +3017,68 @@ mod tests { ); // Moving to the end of line again is a no-op. - view.update(app, |view, ctx| view.move_to_end_of_line(&(), ctx)); + view.update(cx, |view, cx| view.move_to_end_of_line(&(), cx)); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), &[ DisplayPoint::new(0, 3)..DisplayPoint::new(0, 3), DisplayPoint::new(1, 5)..DisplayPoint::new(1, 5), ] ); - view.update(app, |view, ctx| { - view.move_left(&(), ctx); - view.select_to_beginning_of_line(&true, ctx); + view.update(cx, |view, cx| { + view.move_left(&(), cx); + view.select_to_beginning_of_line(&true, cx); }); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), &[ DisplayPoint::new(0, 2)..DisplayPoint::new(0, 0), DisplayPoint::new(1, 4)..DisplayPoint::new(1, 2), ] ); - view.update(app, |view, ctx| { - view.select_to_beginning_of_line(&true, ctx) - }); + view.update(cx, |view, cx| view.select_to_beginning_of_line(&true, cx)); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), &[ DisplayPoint::new(0, 2)..DisplayPoint::new(0, 0), DisplayPoint::new(1, 4)..DisplayPoint::new(1, 0), ] ); - view.update(app, |view, ctx| { - view.select_to_beginning_of_line(&true, ctx) - }); + view.update(cx, |view, cx| view.select_to_beginning_of_line(&true, cx)); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), &[ DisplayPoint::new(0, 2)..DisplayPoint::new(0, 0), DisplayPoint::new(1, 4)..DisplayPoint::new(1, 2), ] ); - view.update(app, |view, ctx| view.select_to_end_of_line(&(), ctx)); + view.update(cx, |view, cx| view.select_to_end_of_line(&(), cx)); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), &[ DisplayPoint::new(0, 2)..DisplayPoint::new(0, 3), DisplayPoint::new(1, 4)..DisplayPoint::new(1, 5), ] ); - view.update(app, |view, ctx| view.delete_to_end_of_line(&(), ctx)); - assert_eq!(view.read(app).text(app.as_ref()), "ab\n de"); + view.update(cx, |view, cx| view.delete_to_end_of_line(&(), cx)); + assert_eq!(view.read(cx).text(cx.as_ref()), "ab\n de"); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), &[ DisplayPoint::new(0, 2)..DisplayPoint::new(0, 2), DisplayPoint::new(1, 4)..DisplayPoint::new(1, 4), ] ); - view.update(app, |view, ctx| view.delete_to_beginning_of_line(&(), ctx)); - assert_eq!(view.read(app).text(app.as_ref()), "\n"); + view.update(cx, |view, cx| view.delete_to_beginning_of_line(&(), cx)); + assert_eq!(view.read(cx).text(cx.as_ref()), "\n"); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), &[ DisplayPoint::new(0, 0)..DisplayPoint::new(0, 0), DisplayPoint::new(1, 0)..DisplayPoint::new(1, 0), @@ -3098,178 +3087,166 @@ mod tests { } #[gpui::test] - fn test_prev_next_word_boundary(app: &mut gpui::MutableAppContext) { + fn test_prev_next_word_boundary(cx: &mut gpui::MutableAppContext) { let buffer = - app.add_model(|ctx| Buffer::new(0, "use std::str::{foo, bar}\n\n {baz.qux()}", ctx)); - let settings = settings::channel(&app.font_cache()).unwrap().1; - let (_, view) = app.add_window(|ctx| Editor::for_buffer(buffer, settings, ctx)); - view.update(app, |view, ctx| { + cx.add_model(|cx| Buffer::new(0, "use std::str::{foo, bar}\n\n {baz.qux()}", cx)); + let settings = settings::channel(&cx.font_cache()).unwrap().1; + let (_, view) = cx.add_window(|cx| Editor::for_buffer(buffer, settings, cx)); + view.update(cx, |view, cx| { view.select_display_ranges( &[ DisplayPoint::new(0, 11)..DisplayPoint::new(0, 11), DisplayPoint::new(2, 4)..DisplayPoint::new(2, 4), ], - ctx, + cx, ) .unwrap(); }); - view.update(app, |view, ctx| { - view.move_to_previous_word_boundary(&(), ctx) - }); + view.update(cx, |view, cx| view.move_to_previous_word_boundary(&(), cx)); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), &[ DisplayPoint::new(0, 9)..DisplayPoint::new(0, 9), DisplayPoint::new(2, 3)..DisplayPoint::new(2, 3), ] ); - view.update(app, |view, ctx| { - view.move_to_previous_word_boundary(&(), ctx) - }); + view.update(cx, |view, cx| view.move_to_previous_word_boundary(&(), cx)); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), &[ DisplayPoint::new(0, 7)..DisplayPoint::new(0, 7), DisplayPoint::new(2, 2)..DisplayPoint::new(2, 2), ] ); - view.update(app, |view, ctx| { - view.move_to_previous_word_boundary(&(), ctx) - }); + view.update(cx, |view, cx| view.move_to_previous_word_boundary(&(), cx)); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), &[ DisplayPoint::new(0, 4)..DisplayPoint::new(0, 4), DisplayPoint::new(2, 0)..DisplayPoint::new(2, 0), ] ); - view.update(app, |view, ctx| { - view.move_to_previous_word_boundary(&(), ctx) - }); + view.update(cx, |view, cx| view.move_to_previous_word_boundary(&(), cx)); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), &[ DisplayPoint::new(0, 3)..DisplayPoint::new(0, 3), DisplayPoint::new(1, 0)..DisplayPoint::new(1, 0), ] ); - view.update(app, |view, ctx| { - view.move_to_previous_word_boundary(&(), ctx) - }); + view.update(cx, |view, cx| view.move_to_previous_word_boundary(&(), cx)); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), &[ DisplayPoint::new(0, 0)..DisplayPoint::new(0, 0), DisplayPoint::new(0, 24)..DisplayPoint::new(0, 24), ] ); - view.update(app, |view, ctx| { - view.move_to_previous_word_boundary(&(), ctx) - }); + view.update(cx, |view, cx| view.move_to_previous_word_boundary(&(), cx)); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), &[ DisplayPoint::new(0, 0)..DisplayPoint::new(0, 0), DisplayPoint::new(0, 23)..DisplayPoint::new(0, 23), ] ); - view.update(app, |view, ctx| view.move_to_next_word_boundary(&(), ctx)); + view.update(cx, |view, cx| view.move_to_next_word_boundary(&(), cx)); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), &[ DisplayPoint::new(0, 3)..DisplayPoint::new(0, 3), DisplayPoint::new(0, 24)..DisplayPoint::new(0, 24), ] ); - view.update(app, |view, ctx| view.move_to_next_word_boundary(&(), ctx)); + view.update(cx, |view, cx| view.move_to_next_word_boundary(&(), cx)); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), &[ DisplayPoint::new(0, 4)..DisplayPoint::new(0, 4), DisplayPoint::new(1, 0)..DisplayPoint::new(1, 0), ] ); - view.update(app, |view, ctx| view.move_to_next_word_boundary(&(), ctx)); + view.update(cx, |view, cx| view.move_to_next_word_boundary(&(), cx)); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), &[ DisplayPoint::new(0, 7)..DisplayPoint::new(0, 7), DisplayPoint::new(2, 0)..DisplayPoint::new(2, 0), ] ); - view.update(app, |view, ctx| view.move_to_next_word_boundary(&(), ctx)); + view.update(cx, |view, cx| view.move_to_next_word_boundary(&(), cx)); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), &[ DisplayPoint::new(0, 9)..DisplayPoint::new(0, 9), DisplayPoint::new(2, 2)..DisplayPoint::new(2, 2), ] ); - view.update(app, |view, ctx| { - view.move_right(&(), ctx); - view.select_to_previous_word_boundary(&(), ctx); + view.update(cx, |view, cx| { + view.move_right(&(), cx); + view.select_to_previous_word_boundary(&(), cx); }); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), &[ DisplayPoint::new(0, 10)..DisplayPoint::new(0, 9), DisplayPoint::new(2, 3)..DisplayPoint::new(2, 2), ] ); - view.update(app, |view, ctx| { - view.select_to_previous_word_boundary(&(), ctx) + view.update(cx, |view, cx| { + view.select_to_previous_word_boundary(&(), cx) }); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), &[ DisplayPoint::new(0, 10)..DisplayPoint::new(0, 7), DisplayPoint::new(2, 3)..DisplayPoint::new(2, 0), ] ); - view.update(app, |view, ctx| view.select_to_next_word_boundary(&(), ctx)); + view.update(cx, |view, cx| view.select_to_next_word_boundary(&(), cx)); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), &[ DisplayPoint::new(0, 10)..DisplayPoint::new(0, 9), DisplayPoint::new(2, 3)..DisplayPoint::new(2, 2), ] ); - view.update(app, |view, ctx| view.delete_to_next_word_boundary(&(), ctx)); + view.update(cx, |view, cx| view.delete_to_next_word_boundary(&(), cx)); assert_eq!( - view.read(app).text(app.as_ref()), + view.read(cx).text(cx.as_ref()), "use std::s::{foo, bar}\n\n {az.qux()}" ); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), &[ DisplayPoint::new(0, 10)..DisplayPoint::new(0, 10), DisplayPoint::new(2, 3)..DisplayPoint::new(2, 3), ] ); - view.update(app, |view, ctx| { - view.delete_to_previous_word_boundary(&(), ctx) + view.update(cx, |view, cx| { + view.delete_to_previous_word_boundary(&(), cx) }); assert_eq!( - view.read(app).text(app.as_ref()), + view.read(cx).text(cx.as_ref()), "use std::::{foo, bar}\n\n az.qux()}" ); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), &[ DisplayPoint::new(0, 9)..DisplayPoint::new(0, 9), DisplayPoint::new(2, 2)..DisplayPoint::new(2, 2), @@ -3278,18 +3255,18 @@ mod tests { } #[gpui::test] - fn test_backspace(app: &mut gpui::MutableAppContext) { - let buffer = app.add_model(|ctx| { + fn test_backspace(cx: &mut gpui::MutableAppContext) { + let buffer = cx.add_model(|cx| { Buffer::new( 0, "one two three\nfour five six\nseven eight nine\nten\n", - ctx, + cx, ) }); - let settings = settings::channel(&app.font_cache()).unwrap().1; - let (_, view) = app.add_window(|ctx| Editor::for_buffer(buffer.clone(), settings, ctx)); + let settings = settings::channel(&cx.font_cache()).unwrap().1; + let (_, view) = cx.add_window(|cx| Editor::for_buffer(buffer.clone(), settings, cx)); - view.update(app, |view, ctx| { + view.update(cx, |view, cx| { view.select_display_ranges( &[ // an empty selection - the preceding character is deleted @@ -3299,31 +3276,31 @@ mod tests { // a line suffix selected - it is deleted DisplayPoint::new(2, 6)..DisplayPoint::new(3, 0), ], - ctx, + cx, ) .unwrap(); - view.backspace(&(), ctx); + view.backspace(&(), cx); }); assert_eq!( - buffer.read(app).text(), + buffer.read(cx).text(), "oe two three\nfou five six\nseven ten\n" ); } #[gpui::test] - fn test_delete(app: &mut gpui::MutableAppContext) { - let buffer = app.add_model(|ctx| { + fn test_delete(cx: &mut gpui::MutableAppContext) { + let buffer = cx.add_model(|cx| { Buffer::new( 0, "one two three\nfour five six\nseven eight nine\nten\n", - ctx, + cx, ) }); - let settings = settings::channel(&app.font_cache()).unwrap().1; - let (_, view) = app.add_window(|ctx| Editor::for_buffer(buffer.clone(), settings, ctx)); + let settings = settings::channel(&cx.font_cache()).unwrap().1; + let (_, view) = cx.add_window(|cx| Editor::for_buffer(buffer.clone(), settings, cx)); - view.update(app, |view, ctx| { + view.update(cx, |view, cx| { view.select_display_ranges( &[ // an empty selection - the following character is deleted @@ -3333,65 +3310,65 @@ mod tests { // a line suffix selected - it is deleted DisplayPoint::new(2, 6)..DisplayPoint::new(3, 0), ], - ctx, + cx, ) .unwrap(); - view.delete(&(), ctx); + view.delete(&(), cx); }); assert_eq!( - buffer.read(app).text(), + buffer.read(cx).text(), "on two three\nfou five six\nseven ten\n" ); } #[gpui::test] - fn test_delete_line(app: &mut gpui::MutableAppContext) { - let settings = settings::channel(&app.font_cache()).unwrap().1; - let buffer = app.add_model(|ctx| Buffer::new(0, "abc\ndef\nghi\n", ctx)); - let (_, view) = app.add_window(|ctx| Editor::for_buffer(buffer, settings, ctx)); - view.update(app, |view, ctx| { + fn test_delete_line(cx: &mut gpui::MutableAppContext) { + let settings = settings::channel(&cx.font_cache()).unwrap().1; + let buffer = cx.add_model(|cx| Buffer::new(0, "abc\ndef\nghi\n", cx)); + let (_, view) = cx.add_window(|cx| Editor::for_buffer(buffer, settings, cx)); + view.update(cx, |view, cx| { view.select_display_ranges( &[ DisplayPoint::new(0, 1)..DisplayPoint::new(0, 1), DisplayPoint::new(1, 0)..DisplayPoint::new(1, 1), DisplayPoint::new(3, 0)..DisplayPoint::new(3, 0), ], - ctx, + cx, ) .unwrap(); - view.delete_line(&(), ctx); + view.delete_line(&(), cx); }); - assert_eq!(view.read(app).text(app.as_ref()), "ghi"); + assert_eq!(view.read(cx).text(cx.as_ref()), "ghi"); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), vec![ DisplayPoint::new(0, 0)..DisplayPoint::new(0, 0), DisplayPoint::new(0, 1)..DisplayPoint::new(0, 1) ] ); - let settings = settings::channel(&app.font_cache()).unwrap().1; - let buffer = app.add_model(|ctx| Buffer::new(0, "abc\ndef\nghi\n", ctx)); - let (_, view) = app.add_window(|ctx| Editor::for_buffer(buffer, settings, ctx)); - view.update(app, |view, ctx| { - view.select_display_ranges(&[DisplayPoint::new(2, 0)..DisplayPoint::new(0, 1)], ctx) + let settings = settings::channel(&cx.font_cache()).unwrap().1; + let buffer = cx.add_model(|cx| Buffer::new(0, "abc\ndef\nghi\n", cx)); + let (_, view) = cx.add_window(|cx| Editor::for_buffer(buffer, settings, cx)); + view.update(cx, |view, cx| { + view.select_display_ranges(&[DisplayPoint::new(2, 0)..DisplayPoint::new(0, 1)], cx) .unwrap(); - view.delete_line(&(), ctx); + view.delete_line(&(), cx); }); - assert_eq!(view.read(app).text(app.as_ref()), "ghi\n"); + assert_eq!(view.read(cx).text(cx.as_ref()), "ghi\n"); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), vec![DisplayPoint::new(0, 1)..DisplayPoint::new(0, 1)] ); } #[gpui::test] - fn test_duplicate_line(app: &mut gpui::MutableAppContext) { - let settings = settings::channel(&app.font_cache()).unwrap().1; - let buffer = app.add_model(|ctx| Buffer::new(0, "abc\ndef\nghi\n", ctx)); - let (_, view) = app.add_window(|ctx| Editor::for_buffer(buffer, settings, ctx)); - view.update(app, |view, ctx| { + fn test_duplicate_line(cx: &mut gpui::MutableAppContext) { + let settings = settings::channel(&cx.font_cache()).unwrap().1; + let buffer = cx.add_model(|cx| Buffer::new(0, "abc\ndef\nghi\n", cx)); + let (_, view) = cx.add_window(|cx| Editor::for_buffer(buffer, settings, cx)); + view.update(cx, |view, cx| { view.select_display_ranges( &[ DisplayPoint::new(0, 0)..DisplayPoint::new(0, 1), @@ -3399,17 +3376,17 @@ mod tests { DisplayPoint::new(1, 0)..DisplayPoint::new(1, 0), DisplayPoint::new(3, 0)..DisplayPoint::new(3, 0), ], - ctx, + cx, ) .unwrap(); - view.duplicate_line(&(), ctx); + view.duplicate_line(&(), cx); }); assert_eq!( - view.read(app).text(app.as_ref()), + view.read(cx).text(cx.as_ref()), "abc\nabc\ndef\ndef\nghi\n\n" ); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), vec![ DisplayPoint::new(1, 0)..DisplayPoint::new(1, 1), DisplayPoint::new(1, 2)..DisplayPoint::new(1, 2), @@ -3418,26 +3395,26 @@ mod tests { ] ); - let settings = settings::channel(&app.font_cache()).unwrap().1; - let buffer = app.add_model(|ctx| Buffer::new(0, "abc\ndef\nghi\n", ctx)); - let (_, view) = app.add_window(|ctx| Editor::for_buffer(buffer, settings, ctx)); - view.update(app, |view, ctx| { + let settings = settings::channel(&cx.font_cache()).unwrap().1; + let buffer = cx.add_model(|cx| Buffer::new(0, "abc\ndef\nghi\n", cx)); + let (_, view) = cx.add_window(|cx| Editor::for_buffer(buffer, settings, cx)); + view.update(cx, |view, cx| { view.select_display_ranges( &[ DisplayPoint::new(0, 1)..DisplayPoint::new(1, 1), DisplayPoint::new(1, 2)..DisplayPoint::new(2, 1), ], - ctx, + cx, ) .unwrap(); - view.duplicate_line(&(), ctx); + view.duplicate_line(&(), cx); }); assert_eq!( - view.read(app).text(app.as_ref()), + view.read(cx).text(cx.as_ref()), "abc\ndef\nghi\nabc\ndef\nghi\n" ); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), vec![ DisplayPoint::new(3, 1)..DisplayPoint::new(4, 1), DisplayPoint::new(4, 2)..DisplayPoint::new(5, 1), @@ -3446,18 +3423,18 @@ mod tests { } #[gpui::test] - fn test_move_line_up_down(app: &mut gpui::MutableAppContext) { - let settings = settings::channel(&app.font_cache()).unwrap().1; - let buffer = app.add_model(|ctx| Buffer::new(0, sample_text(10, 5), ctx)); - let (_, view) = app.add_window(|ctx| Editor::for_buffer(buffer, settings, ctx)); - view.update(app, |view, ctx| { + fn test_move_line_up_down(cx: &mut gpui::MutableAppContext) { + let settings = settings::channel(&cx.font_cache()).unwrap().1; + let buffer = cx.add_model(|cx| Buffer::new(0, sample_text(10, 5), cx)); + let (_, view) = cx.add_window(|cx| Editor::for_buffer(buffer, settings, cx)); + view.update(cx, |view, cx| { view.fold_ranges( vec![ Point::new(0, 2)..Point::new(1, 2), Point::new(2, 3)..Point::new(4, 1), Point::new(7, 0)..Point::new(8, 4), ], - ctx, + cx, ); view.select_display_ranges( &[ @@ -3466,22 +3443,22 @@ mod tests { DisplayPoint::new(3, 2)..DisplayPoint::new(4, 3), DisplayPoint::new(5, 0)..DisplayPoint::new(5, 2), ], - ctx, + cx, ) .unwrap(); }); assert_eq!( - view.read(app).text(app.as_ref()), + view.read(cx).text(cx.as_ref()), "aa…bbb\nccc…eeee\nfffff\nggggg\n…i\njjjjj" ); - view.update(app, |view, ctx| view.move_line_up(&(), ctx)); + view.update(cx, |view, cx| view.move_line_up(&(), cx)); assert_eq!( - view.read(app).text(app.as_ref()), + view.read(cx).text(cx.as_ref()), "aa…bbb\nccc…eeee\nggggg\n…i\njjjjj\nfffff" ); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), vec![ DisplayPoint::new(0, 1)..DisplayPoint::new(0, 1), DisplayPoint::new(2, 1)..DisplayPoint::new(2, 1), @@ -3490,13 +3467,13 @@ mod tests { ] ); - view.update(app, |view, ctx| view.move_line_down(&(), ctx)); + view.update(cx, |view, cx| view.move_line_down(&(), cx)); assert_eq!( - view.read(app).text(app.as_ref()), + view.read(cx).text(cx.as_ref()), "ccc…eeee\naa…bbb\nfffff\nggggg\n…i\njjjjj" ); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), vec![ DisplayPoint::new(1, 1)..DisplayPoint::new(1, 1), DisplayPoint::new(3, 1)..DisplayPoint::new(3, 1), @@ -3505,13 +3482,13 @@ mod tests { ] ); - view.update(app, |view, ctx| view.move_line_down(&(), ctx)); + view.update(cx, |view, cx| view.move_line_down(&(), cx)); assert_eq!( - view.read(app).text(app.as_ref()), + view.read(cx).text(cx.as_ref()), "ccc…eeee\nfffff\naa…bbb\nggggg\n…i\njjjjj" ); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), vec![ DisplayPoint::new(2, 1)..DisplayPoint::new(2, 1), DisplayPoint::new(3, 1)..DisplayPoint::new(3, 1), @@ -3520,13 +3497,13 @@ mod tests { ] ); - view.update(app, |view, ctx| view.move_line_up(&(), ctx)); + view.update(cx, |view, cx| view.move_line_up(&(), cx)); assert_eq!( - view.read(app).text(app.as_ref()), + view.read(cx).text(cx.as_ref()), "ccc…eeee\naa…bbb\nggggg\n…i\njjjjj\nfffff" ); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), vec![ DisplayPoint::new(1, 1)..DisplayPoint::new(1, 1), DisplayPoint::new(2, 1)..DisplayPoint::new(2, 1), @@ -3537,31 +3514,31 @@ mod tests { } #[gpui::test] - fn test_clipboard(app: &mut gpui::MutableAppContext) { - let buffer = app.add_model(|ctx| Buffer::new(0, "one two three four five six ", ctx)); - let settings = settings::channel(&app.font_cache()).unwrap().1; - let view = app - .add_window(|ctx| Editor::for_buffer(buffer.clone(), settings, ctx)) + fn test_clipboard(cx: &mut gpui::MutableAppContext) { + let buffer = cx.add_model(|cx| Buffer::new(0, "one two three four five six ", cx)); + let settings = settings::channel(&cx.font_cache()).unwrap().1; + let view = cx + .add_window(|cx| Editor::for_buffer(buffer.clone(), settings, cx)) .1; // Cut with three selections. Clipboard text is divided into three slices. - view.update(app, |view, ctx| { - view.select_ranges(vec![0..4, 8..14, 19..24], false, ctx); - view.cut(&(), ctx); + view.update(cx, |view, cx| { + view.select_ranges(vec![0..4, 8..14, 19..24], false, cx); + view.cut(&(), cx); }); - assert_eq!(view.read(app).text(app.as_ref()), "two four six "); + assert_eq!(view.read(cx).text(cx.as_ref()), "two four six "); // Paste with three cursors. Each cursor pastes one slice of the clipboard text. - view.update(app, |view, ctx| { - view.select_ranges(vec![4..4, 9..9, 13..13], false, ctx); - view.paste(&(), ctx); + view.update(cx, |view, cx| { + view.select_ranges(vec![4..4, 9..9, 13..13], false, cx); + view.paste(&(), cx); }); assert_eq!( - view.read(app).text(app.as_ref()), + view.read(cx).text(cx.as_ref()), "two one four three six five " ); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), &[ DisplayPoint::new(0, 8)..DisplayPoint::new(0, 8), DisplayPoint::new(0, 19)..DisplayPoint::new(0, 19), @@ -3572,64 +3549,64 @@ mod tests { // Paste again but with only two cursors. Since the number of cursors doesn't // match the number of slices in the clipboard, the entire clipboard text // is pasted at each cursor. - view.update(app, |view, ctx| { - view.select_ranges(vec![0..0, 28..28], false, ctx); - view.insert(&"( ".to_string(), ctx); - view.paste(&(), ctx); - view.insert(&") ".to_string(), ctx); + view.update(cx, |view, cx| { + view.select_ranges(vec![0..0, 28..28], false, cx); + view.insert(&"( ".to_string(), cx); + view.paste(&(), cx); + view.insert(&") ".to_string(), cx); }); assert_eq!( - view.read(app).text(app.as_ref()), + view.read(cx).text(cx.as_ref()), "( one three five ) two one four three six five ( one three five ) " ); - view.update(app, |view, ctx| { - view.select_ranges(vec![0..0], false, ctx); - view.insert(&"123\n4567\n89\n".to_string(), ctx); + view.update(cx, |view, cx| { + view.select_ranges(vec![0..0], false, cx); + view.insert(&"123\n4567\n89\n".to_string(), cx); }); assert_eq!( - view.read(app).text(app.as_ref()), + view.read(cx).text(cx.as_ref()), "123\n4567\n89\n( one three five ) two one four three six five ( one three five ) " ); // Cut with three selections, one of which is full-line. - view.update(app, |view, ctx| { + view.update(cx, |view, cx| { view.select_display_ranges( &[ DisplayPoint::new(0, 1)..DisplayPoint::new(0, 2), DisplayPoint::new(1, 1)..DisplayPoint::new(1, 1), DisplayPoint::new(2, 0)..DisplayPoint::new(2, 1), ], - ctx, + cx, ) .unwrap(); - view.cut(&(), ctx); + view.cut(&(), cx); }); assert_eq!( - view.read(app).text(app.as_ref()), + view.read(cx).text(cx.as_ref()), "13\n9\n( one three five ) two one four three six five ( one three five ) " ); // Paste with three selections, noticing how the copied selection that was full-line // gets inserted before the second cursor. - view.update(app, |view, ctx| { + view.update(cx, |view, cx| { view.select_display_ranges( &[ DisplayPoint::new(0, 1)..DisplayPoint::new(0, 1), DisplayPoint::new(1, 1)..DisplayPoint::new(1, 1), DisplayPoint::new(2, 2)..DisplayPoint::new(2, 3), ], - ctx, + cx, ) .unwrap(); - view.paste(&(), ctx); + view.paste(&(), cx); }); assert_eq!( - view.read(app).text(app.as_ref()), + view.read(cx).text(cx.as_ref()), "123\n4567\n9\n( 8ne three five ) two one four three six five ( one three five ) " ); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), &[ DisplayPoint::new(0, 2)..DisplayPoint::new(0, 2), DisplayPoint::new(2, 1)..DisplayPoint::new(2, 1), @@ -3638,32 +3615,32 @@ mod tests { ); // Copy with a single cursor only, which writes the whole line into the clipboard. - view.update(app, |view, ctx| { - view.select_display_ranges(&[DisplayPoint::new(0, 1)..DisplayPoint::new(0, 1)], ctx) + view.update(cx, |view, cx| { + view.select_display_ranges(&[DisplayPoint::new(0, 1)..DisplayPoint::new(0, 1)], cx) .unwrap(); - view.copy(&(), ctx); + view.copy(&(), cx); }); // Paste with three selections, noticing how the copied full-line selection is inserted // before the empty selections but replaces the selection that is non-empty. - view.update(app, |view, ctx| { + view.update(cx, |view, cx| { view.select_display_ranges( &[ DisplayPoint::new(0, 1)..DisplayPoint::new(0, 1), DisplayPoint::new(1, 0)..DisplayPoint::new(1, 2), DisplayPoint::new(2, 1)..DisplayPoint::new(2, 1), ], - ctx, + cx, ) .unwrap(); - view.paste(&(), ctx); + view.paste(&(), cx); }); assert_eq!( - view.read(app).text(app.as_ref()), + view.read(cx).text(cx.as_ref()), "123\n123\n123\n67\n123\n9\n( 8ne three five ) two one four three six five ( one three five ) " ); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), &[ DisplayPoint::new(1, 1)..DisplayPoint::new(1, 1), DisplayPoint::new(3, 0)..DisplayPoint::new(3, 0), @@ -3673,23 +3650,23 @@ mod tests { } #[gpui::test] - fn test_select_all(app: &mut gpui::MutableAppContext) { - let buffer = app.add_model(|ctx| Buffer::new(0, "abc\nde\nfgh", ctx)); - let settings = settings::channel(&app.font_cache()).unwrap().1; - let (_, view) = app.add_window(|ctx| Editor::for_buffer(buffer, settings, ctx)); - view.update(app, |b, ctx| b.select_all(&(), ctx)); + fn test_select_all(cx: &mut gpui::MutableAppContext) { + let buffer = cx.add_model(|cx| Buffer::new(0, "abc\nde\nfgh", cx)); + let settings = settings::channel(&cx.font_cache()).unwrap().1; + let (_, view) = cx.add_window(|cx| Editor::for_buffer(buffer, settings, cx)); + view.update(cx, |b, cx| b.select_all(&(), cx)); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), &[DisplayPoint::new(0, 0)..DisplayPoint::new(2, 3)] ); } #[gpui::test] - fn test_select_line(app: &mut gpui::MutableAppContext) { - let settings = settings::channel(&app.font_cache()).unwrap().1; - let buffer = app.add_model(|ctx| Buffer::new(0, sample_text(6, 5), ctx)); - let (_, view) = app.add_window(|ctx| Editor::for_buffer(buffer, settings, ctx)); - view.update(app, |view, ctx| { + fn test_select_line(cx: &mut gpui::MutableAppContext) { + let settings = settings::channel(&cx.font_cache()).unwrap().1; + let buffer = cx.add_model(|cx| Buffer::new(0, sample_text(6, 5), cx)); + let (_, view) = cx.add_window(|cx| Editor::for_buffer(buffer, settings, cx)); + view.update(cx, |view, cx| { view.select_display_ranges( &[ DisplayPoint::new(0, 0)..DisplayPoint::new(0, 1), @@ -3697,48 +3674,48 @@ mod tests { DisplayPoint::new(1, 0)..DisplayPoint::new(1, 0), DisplayPoint::new(4, 2)..DisplayPoint::new(4, 2), ], - ctx, + cx, ) .unwrap(); - view.select_line(&(), ctx); + view.select_line(&(), cx); }); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), vec![ DisplayPoint::new(0, 0)..DisplayPoint::new(2, 0), DisplayPoint::new(4, 0)..DisplayPoint::new(5, 0), ] ); - view.update(app, |view, ctx| view.select_line(&(), ctx)); + view.update(cx, |view, cx| view.select_line(&(), cx)); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), vec![ DisplayPoint::new(0, 0)..DisplayPoint::new(3, 0), DisplayPoint::new(4, 0)..DisplayPoint::new(5, 5), ] ); - view.update(app, |view, ctx| view.select_line(&(), ctx)); + view.update(cx, |view, cx| view.select_line(&(), cx)); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), vec![DisplayPoint::new(0, 0)..DisplayPoint::new(5, 5)] ); } #[gpui::test] - fn test_split_selection_into_lines(app: &mut gpui::MutableAppContext) { - let settings = settings::channel(&app.font_cache()).unwrap().1; - let buffer = app.add_model(|ctx| Buffer::new(0, sample_text(9, 5), ctx)); - let (_, view) = app.add_window(|ctx| Editor::for_buffer(buffer, settings, ctx)); - view.update(app, |view, ctx| { + fn test_split_selection_into_lines(cx: &mut gpui::MutableAppContext) { + let settings = settings::channel(&cx.font_cache()).unwrap().1; + let buffer = cx.add_model(|cx| Buffer::new(0, sample_text(9, 5), cx)); + let (_, view) = cx.add_window(|cx| Editor::for_buffer(buffer, settings, cx)); + view.update(cx, |view, cx| { view.fold_ranges( vec![ Point::new(0, 2)..Point::new(1, 2), Point::new(2, 3)..Point::new(4, 1), Point::new(7, 0)..Point::new(8, 4), ], - ctx, + cx, ); view.select_display_ranges( &[ @@ -3747,22 +3724,22 @@ mod tests { DisplayPoint::new(1, 0)..DisplayPoint::new(1, 0), DisplayPoint::new(4, 4)..DisplayPoint::new(4, 4), ], - ctx, + cx, ) .unwrap(); }); assert_eq!( - view.read(app).text(app.as_ref()), + view.read(cx).text(cx.as_ref()), "aa…bbb\nccc…eeee\nfffff\nggggg\n…i" ); - view.update(app, |view, ctx| view.split_selection_into_lines(&(), ctx)); + view.update(cx, |view, cx| view.split_selection_into_lines(&(), cx)); assert_eq!( - view.read(app).text(app.as_ref()), + view.read(cx).text(cx.as_ref()), "aa…bbb\nccc…eeee\nfffff\nggggg\n…i" ); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), [ DisplayPoint::new(0, 1)..DisplayPoint::new(0, 1), DisplayPoint::new(0, 2)..DisplayPoint::new(0, 2), @@ -3771,17 +3748,17 @@ mod tests { ] ); - view.update(app, |view, ctx| { - view.select_display_ranges(&[DisplayPoint::new(4, 0)..DisplayPoint::new(0, 1)], ctx) + view.update(cx, |view, cx| { + view.select_display_ranges(&[DisplayPoint::new(4, 0)..DisplayPoint::new(0, 1)], cx) .unwrap(); - view.split_selection_into_lines(&(), ctx); + view.split_selection_into_lines(&(), cx); }); assert_eq!( - view.read(app).text(app.as_ref()), + view.read(cx).text(cx.as_ref()), "aaaaa\nbbbbb\nccccc\nddddd\neeeee\nfffff\nggggg\n…i" ); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), [ DisplayPoint::new(0, 1)..DisplayPoint::new(0, 1), DisplayPoint::new(1, 5)..DisplayPoint::new(1, 5), @@ -3796,98 +3773,98 @@ mod tests { } #[gpui::test] - fn test_add_selection_above_below(app: &mut gpui::MutableAppContext) { - let settings = settings::channel(&app.font_cache()).unwrap().1; - let buffer = app.add_model(|ctx| Buffer::new(0, "abc\ndefghi\n\njk\nlmno\n", ctx)); - let (_, view) = app.add_window(|ctx| Editor::for_buffer(buffer, settings, ctx)); + fn test_add_selection_above_below(cx: &mut gpui::MutableAppContext) { + let settings = settings::channel(&cx.font_cache()).unwrap().1; + let buffer = cx.add_model(|cx| Buffer::new(0, "abc\ndefghi\n\njk\nlmno\n", cx)); + let (_, view) = cx.add_window(|cx| Editor::for_buffer(buffer, settings, cx)); - view.update(app, |view, ctx| { - view.select_display_ranges(&[DisplayPoint::new(1, 3)..DisplayPoint::new(1, 3)], ctx) + view.update(cx, |view, cx| { + view.select_display_ranges(&[DisplayPoint::new(1, 3)..DisplayPoint::new(1, 3)], cx) .unwrap(); }); - view.update(app, |view, ctx| view.add_selection_above(&(), ctx)); + view.update(cx, |view, cx| view.add_selection_above(&(), cx)); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), vec![ DisplayPoint::new(0, 3)..DisplayPoint::new(0, 3), DisplayPoint::new(1, 3)..DisplayPoint::new(1, 3) ] ); - view.update(app, |view, ctx| view.add_selection_above(&(), ctx)); + view.update(cx, |view, cx| view.add_selection_above(&(), cx)); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), vec![ DisplayPoint::new(0, 3)..DisplayPoint::new(0, 3), DisplayPoint::new(1, 3)..DisplayPoint::new(1, 3) ] ); - view.update(app, |view, ctx| view.add_selection_below(&(), ctx)); + view.update(cx, |view, cx| view.add_selection_below(&(), cx)); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), vec![DisplayPoint::new(1, 3)..DisplayPoint::new(1, 3)] ); - view.update(app, |view, ctx| view.add_selection_below(&(), ctx)); + view.update(cx, |view, cx| view.add_selection_below(&(), cx)); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), vec![ DisplayPoint::new(1, 3)..DisplayPoint::new(1, 3), DisplayPoint::new(4, 3)..DisplayPoint::new(4, 3) ] ); - view.update(app, |view, ctx| view.add_selection_below(&(), ctx)); + view.update(cx, |view, cx| view.add_selection_below(&(), cx)); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), vec![ DisplayPoint::new(1, 3)..DisplayPoint::new(1, 3), DisplayPoint::new(4, 3)..DisplayPoint::new(4, 3) ] ); - view.update(app, |view, ctx| { - view.select_display_ranges(&[DisplayPoint::new(1, 4)..DisplayPoint::new(1, 3)], ctx) + view.update(cx, |view, cx| { + view.select_display_ranges(&[DisplayPoint::new(1, 4)..DisplayPoint::new(1, 3)], cx) .unwrap(); }); - view.update(app, |view, ctx| view.add_selection_below(&(), ctx)); + view.update(cx, |view, cx| view.add_selection_below(&(), cx)); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), vec![ DisplayPoint::new(1, 4)..DisplayPoint::new(1, 3), DisplayPoint::new(4, 4)..DisplayPoint::new(4, 3) ] ); - view.update(app, |view, ctx| view.add_selection_below(&(), ctx)); + view.update(cx, |view, cx| view.add_selection_below(&(), cx)); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), vec![ DisplayPoint::new(1, 4)..DisplayPoint::new(1, 3), DisplayPoint::new(4, 4)..DisplayPoint::new(4, 3) ] ); - view.update(app, |view, ctx| view.add_selection_above(&(), ctx)); + view.update(cx, |view, cx| view.add_selection_above(&(), cx)); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), vec![DisplayPoint::new(1, 4)..DisplayPoint::new(1, 3)] ); - view.update(app, |view, ctx| view.add_selection_above(&(), ctx)); + view.update(cx, |view, cx| view.add_selection_above(&(), cx)); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), vec![DisplayPoint::new(1, 4)..DisplayPoint::new(1, 3)] ); - view.update(app, |view, ctx| { - view.select_display_ranges(&[DisplayPoint::new(0, 1)..DisplayPoint::new(1, 4)], ctx) + view.update(cx, |view, cx| { + view.select_display_ranges(&[DisplayPoint::new(0, 1)..DisplayPoint::new(1, 4)], cx) .unwrap(); }); - view.update(app, |view, ctx| view.add_selection_below(&(), ctx)); + view.update(cx, |view, cx| view.add_selection_below(&(), cx)); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), vec![ DisplayPoint::new(0, 1)..DisplayPoint::new(0, 3), DisplayPoint::new(1, 1)..DisplayPoint::new(1, 4), @@ -3895,9 +3872,9 @@ mod tests { ] ); - view.update(app, |view, ctx| view.add_selection_below(&(), ctx)); + view.update(cx, |view, cx| view.add_selection_below(&(), cx)); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), vec![ DisplayPoint::new(0, 1)..DisplayPoint::new(0, 3), DisplayPoint::new(1, 1)..DisplayPoint::new(1, 4), @@ -3906,9 +3883,9 @@ mod tests { ] ); - view.update(app, |view, ctx| view.add_selection_above(&(), ctx)); + view.update(cx, |view, cx| view.add_selection_above(&(), cx)); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), vec![ DisplayPoint::new(0, 1)..DisplayPoint::new(0, 3), DisplayPoint::new(1, 1)..DisplayPoint::new(1, 4), @@ -3916,13 +3893,13 @@ mod tests { ] ); - view.update(app, |view, ctx| { - view.select_display_ranges(&[DisplayPoint::new(4, 3)..DisplayPoint::new(1, 1)], ctx) + view.update(cx, |view, cx| { + view.select_display_ranges(&[DisplayPoint::new(4, 3)..DisplayPoint::new(1, 1)], cx) .unwrap(); }); - view.update(app, |view, ctx| view.add_selection_above(&(), ctx)); + view.update(cx, |view, cx| view.add_selection_above(&(), cx)); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), vec![ DisplayPoint::new(0, 3)..DisplayPoint::new(0, 1), DisplayPoint::new(1, 3)..DisplayPoint::new(1, 1), @@ -3931,9 +3908,9 @@ mod tests { ] ); - view.update(app, |view, ctx| view.add_selection_below(&(), ctx)); + view.update(cx, |view, cx| view.add_selection_below(&(), cx)); assert_eq!( - view.read(app).selection_ranges(app.as_ref()), + view.read(cx).selection_ranges(cx.as_ref()), vec![ DisplayPoint::new(1, 3)..DisplayPoint::new(1, 1), DisplayPoint::new(3, 2)..DisplayPoint::new(3, 1), @@ -3943,8 +3920,8 @@ mod tests { } #[gpui::test] - async fn test_select_larger_smaller_syntax_node(mut app: gpui::TestAppContext) { - let app_state = app.read(build_app_state); + async fn test_select_larger_smaller_syntax_node(mut cx: gpui::TestAppContext) { + let app_state = cx.read(build_app_state); let lang = app_state.language_registry.select_language("z.rs"); let text = r#" use mod1::mod2::{mod3, mod4}; @@ -3954,28 +3931,28 @@ mod tests { } "# .unindent(); - let buffer = app.add_model(|ctx| { + let buffer = cx.add_model(|cx| { let history = History::new(text.into()); - Buffer::from_history(0, history, None, lang.cloned(), ctx) + Buffer::from_history(0, history, None, lang.cloned(), cx) }); - let (_, view) = app.add_window(|ctx| Editor::for_buffer(buffer, app_state.settings, ctx)); - view.condition(&app, |view, ctx| !view.buffer.read(ctx).is_parsing()) + let (_, view) = cx.add_window(|cx| Editor::for_buffer(buffer, app_state.settings, cx)); + view.condition(&cx, |view, cx| !view.buffer.read(cx).is_parsing()) .await; - view.update(&mut app, |view, ctx| { + view.update(&mut cx, |view, cx| { view.select_display_ranges( &[ DisplayPoint::new(0, 25)..DisplayPoint::new(0, 25), DisplayPoint::new(2, 24)..DisplayPoint::new(2, 12), DisplayPoint::new(3, 18)..DisplayPoint::new(3, 18), ], - ctx, + cx, ) .unwrap(); - view.select_larger_syntax_node(&(), ctx); + view.select_larger_syntax_node(&(), cx); }); assert_eq!( - view.read_with(&app, |view, ctx| view.selection_ranges(ctx)), + view.read_with(&cx, |view, cx| view.selection_ranges(cx)), &[ DisplayPoint::new(0, 23)..DisplayPoint::new(0, 27), DisplayPoint::new(2, 35)..DisplayPoint::new(2, 7), @@ -3983,50 +3960,50 @@ mod tests { ] ); - view.update(&mut app, |view, ctx| { - view.select_larger_syntax_node(&(), ctx); + view.update(&mut cx, |view, cx| { + view.select_larger_syntax_node(&(), cx); }); assert_eq!( - view.read_with(&app, |view, ctx| view.selection_ranges(ctx)), + view.read_with(&cx, |view, cx| view.selection_ranges(cx)), &[ DisplayPoint::new(0, 16)..DisplayPoint::new(0, 28), DisplayPoint::new(4, 1)..DisplayPoint::new(2, 0), ] ); - view.update(&mut app, |view, ctx| { - view.select_larger_syntax_node(&(), ctx); + view.update(&mut cx, |view, cx| { + view.select_larger_syntax_node(&(), cx); }); assert_eq!( - view.read_with(&app, |view, ctx| view.selection_ranges(ctx)), + view.read_with(&cx, |view, cx| view.selection_ranges(cx)), &[DisplayPoint::new(0, 0)..DisplayPoint::new(5, 0)] ); // Trying to expand the selected syntax node one more time has no effect. - view.update(&mut app, |view, ctx| { - view.select_larger_syntax_node(&(), ctx); + view.update(&mut cx, |view, cx| { + view.select_larger_syntax_node(&(), cx); }); assert_eq!( - view.read_with(&app, |view, ctx| view.selection_ranges(ctx)), + view.read_with(&cx, |view, cx| view.selection_ranges(cx)), &[DisplayPoint::new(0, 0)..DisplayPoint::new(5, 0)] ); - view.update(&mut app, |view, ctx| { - view.select_smaller_syntax_node(&(), ctx); + view.update(&mut cx, |view, cx| { + view.select_smaller_syntax_node(&(), cx); }); assert_eq!( - view.read_with(&app, |view, ctx| view.selection_ranges(ctx)), + view.read_with(&cx, |view, cx| view.selection_ranges(cx)), &[ DisplayPoint::new(0, 16)..DisplayPoint::new(0, 28), DisplayPoint::new(4, 1)..DisplayPoint::new(2, 0), ] ); - view.update(&mut app, |view, ctx| { - view.select_smaller_syntax_node(&(), ctx); + view.update(&mut cx, |view, cx| { + view.select_smaller_syntax_node(&(), cx); }); assert_eq!( - view.read_with(&app, |view, ctx| view.selection_ranges(ctx)), + view.read_with(&cx, |view, cx| view.selection_ranges(cx)), &[ DisplayPoint::new(0, 23)..DisplayPoint::new(0, 27), DisplayPoint::new(2, 35)..DisplayPoint::new(2, 7), @@ -4034,11 +4011,11 @@ mod tests { ] ); - view.update(&mut app, |view, ctx| { - view.select_smaller_syntax_node(&(), ctx); + view.update(&mut cx, |view, cx| { + view.select_smaller_syntax_node(&(), cx); }); assert_eq!( - view.read_with(&app, |view, ctx| view.selection_ranges(ctx)), + view.read_with(&cx, |view, cx| view.selection_ranges(cx)), &[ DisplayPoint::new(0, 25)..DisplayPoint::new(0, 25), DisplayPoint::new(2, 24)..DisplayPoint::new(2, 12), @@ -4047,11 +4024,11 @@ mod tests { ); // Trying to shrink the selected syntax node one more time has no effect. - view.update(&mut app, |view, ctx| { - view.select_smaller_syntax_node(&(), ctx); + view.update(&mut cx, |view, cx| { + view.select_smaller_syntax_node(&(), cx); }); assert_eq!( - view.read_with(&app, |view, ctx| view.selection_ranges(ctx)), + view.read_with(&cx, |view, cx| view.selection_ranges(cx)), &[ DisplayPoint::new(0, 25)..DisplayPoint::new(0, 25), DisplayPoint::new(2, 24)..DisplayPoint::new(2, 12), @@ -4061,18 +4038,18 @@ mod tests { // Ensure that we keep expanding the selection if the larger selection starts or ends within // a fold. - view.update(&mut app, |view, ctx| { + view.update(&mut cx, |view, cx| { view.fold_ranges( vec![ Point::new(0, 21)..Point::new(0, 24), Point::new(3, 20)..Point::new(3, 22), ], - ctx, + cx, ); - view.select_larger_syntax_node(&(), ctx); + view.select_larger_syntax_node(&(), cx); }); assert_eq!( - view.read_with(&app, |view, ctx| view.selection_ranges(ctx)), + view.read_with(&cx, |view, cx| view.selection_ranges(cx)), &[ DisplayPoint::new(0, 16)..DisplayPoint::new(0, 28), DisplayPoint::new(2, 35)..DisplayPoint::new(2, 7), @@ -4082,8 +4059,8 @@ mod tests { } impl Editor { - fn selection_ranges(&self, app: &AppContext) -> Vec> { - self.selections_in_range(DisplayPoint::zero()..self.max_point(app), app) + fn selection_ranges(&self, cx: &AppContext) -> Vec> { + self.selections_in_range(DisplayPoint::zero()..self.max_point(cx), cx) .collect::>() } }