oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace app/app_mut on contexts with AsRef/AsMut impls

Browse Source 
Co-Authored-By: Brooks Swinnerton <934497+bswinnerton@users.noreply.github.com>
This commit is contained in:
Nathan Sobo
2021-04-13 20:07:25 -06:00
co-authored by Brooks Swinnerton
parent 7469240a2e
commit 0a2d2aa684
10 changed files with 95 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zed/src/editor/buffer/mod.rs
+1 -1
View File
@@ -447,7 +447,7 @@ impl Buffer {
if let Some(file) = &self.file {
let snapshot = self.snapshot();
let version = self.version.clone();
let save_task = file.save(snapshot, ctx.app());
let save_task = file.save(snapshot, ctx.as_ref());
let task = ctx.spawn(save_task, |me, save_result, ctx| {
if save_result.is_ok() {
me.did_save(version, ctx);
zed/src/editor/buffer_view.rs
+49 -38
View File
@@ -297,7 +297,7 @@ impl BufferView {
let display_map = self.display_map.read(ctx);
let cursor = display_map
.anchor_before(position, Bias::Left, ctx.app())
.anchor_before(position, Bias::Left, ctx.as_ref())
.unwrap();
let selection = Selection {
start: cursor.clone(),
@@ -322,7 +322,9 @@ impl BufferView {
) {
let buffer = self.buffer.read(ctx);
let map = self.display_map.read(ctx);
let cursor = map.anchor_before(position, Bias::Left, ctx.app()).unwrap();
let cursor = map
.anchor_before(position, Bias::Left, ctx.as_ref())
.unwrap();
if let Some(selection) = self.pending_selection.as_mut() {
selection.set_head(buffer, cursor);
} else {
@@ -337,8 +339,8 @@ impl BufferView {
fn end_selection(&mut self, ctx: &mut ViewContext<Self>) {
if let Some(selection) = self.pending_selection.take() {
let ix = self.selection_insertion_index(&selection.start, ctx.app());
let mut selections = self.selections(ctx.app()).to_vec();
let ix = self.selection_insertion_index(&selection.start, ctx.as_ref());
let mut selections = self.selections(ctx.as_ref()).to_vec();
selections.insert(ix, selection);
self.update_selections(selections, ctx);
} else {
@@ -359,8 +361,8 @@ impl BufferView {
let mut selections = Vec::new();
for range in ranges {
selections.push(Selection {
start: map.anchor_after(range.start, Bias::Left, ctx.app())?,
end: map.anchor_before(range.end, Bias::Left, ctx.app())?,
start: map.anchor_after(range.start, Bias::Left, ctx.as_ref())?,
end: map.anchor_before(range.end, Bias::Left, ctx.as_ref())?,
reversed: false,
goal_column: None,
});
@@ -373,7 +375,7 @@ impl BufferView {
let mut offset_ranges = SmallVec::<[Range<usize>; 32]>::new();
{
let buffer = self.buffer.read(ctx);
for selection in self.selections(ctx.app()) {
for selection in self.selections(ctx.as_ref()) {
let start = selection.start.to_offset(buffer).unwrap();
let end = selection.end.to_offset(buffer).unwrap();
offset_ranges.push(start..end);
@@ -423,18 +425,21 @@ impl BufferView {
pub fn backspace(&mut self, _: &(), ctx: &mut ViewContext<Self>) {
self.start_transaction(ctx);
let mut selections = self.selections(ctx.app()).to_vec();
let mut selections = self.selections(ctx.as_ref()).to_vec();
{
let buffer = self.buffer.read(ctx);
let map = self.display_map.read(ctx);
for selection in &mut selections {
if selection.range(buffer).is_empty() {
let head = selection.head().to_display_point(map, ctx.app()).unwrap();
let head = selection
.head()
.to_display_point(map, ctx.as_ref())
.unwrap();
let cursor = map
.anchor_before(
movement::left(map, head, ctx.app()).unwrap(),
movement::left(map, head, ctx.as_ref()).unwrap(),
Bias::Left,
ctx.app(),
ctx.as_ref(),
)
.unwrap();
selection.set_head(&buffer, cursor);
@@ -460,7 +465,7 @@ impl BufferView {
}
pub fn move_left(&mut self, _: &(), ctx: &mut ViewContext<Self>) {
let app = ctx.app();
let app = ctx.as_ref();
let mut selections = self.selections(app).to_vec();
{
let map = self.display_map.read(app);
@@ -486,17 +491,20 @@ impl BufferView {
}
pub fn select_left(&mut self, _: &(), ctx: &mut ViewContext<Self>) {
let mut selections = self.selections(ctx.app()).to_vec();
let mut selections = self.selections(ctx.as_ref()).to_vec();
{
let buffer = self.buffer.read(ctx);
let map = self.display_map.read(ctx);
for selection in &mut selections {
let head = selection.head().to_display_point(map, ctx.app()).unwrap();
let head = selection
.head()
.to_display_point(map, ctx.as_ref())
.unwrap();
let cursor = map
.anchor_before(
movement::left(map, head, ctx.app()).unwrap(),
movement::left(map, head, ctx.as_ref()).unwrap(),
Bias::Left,
ctx.app(),
ctx.as_ref(),
)
.unwrap();
selection.set_head(&buffer, cursor);
@@ -508,9 +516,9 @@ impl BufferView {
}
pub fn move_right(&mut self, _: &(), ctx: &mut ViewContext<Self>) {
let mut selections = self.selections(ctx.app()).to_vec();
let mut selections = self.selections(ctx.as_ref()).to_vec();
{
let app = ctx.app();
let app = ctx.as_ref();
let map = self.display_map.read(app);
for selection in &mut selections {
let start = selection.start.to_display_point(map, app).unwrap();
@@ -534,13 +542,16 @@ impl BufferView {
}
pub fn select_right(&mut self, _: &(), ctx: &mut ViewContext<Self>) {
let mut selections = self.selections(ctx.app()).to_vec();
let mut selections = self.selections(ctx.as_ref()).to_vec();
{
let app = ctx.app();
let app = ctx.as_ref();
let buffer = self.buffer.read(app);
let map = self.display_map.read(app);
for selection in &mut selections {
let head = selection.head().to_display_point(map, ctx.app()).unwrap();
let head = selection
.head()
.to_display_point(map, ctx.as_ref())
.unwrap();
let cursor = map
.anchor_before(movement::right(map, head, app).unwrap(), Bias::Right, app)
.unwrap();
@@ -556,9 +567,9 @@ impl BufferView {
if self.single_line {
ctx.propagate_action();
} else {
let mut selections = self.selections(ctx.app()).to_vec();
let mut selections = self.selections(ctx.as_ref()).to_vec();
{
let app = ctx.app();
let app = ctx.as_ref();
let map = self.display_map.read(app);
for selection in &mut selections {
let start = selection.start.to_display_point(map, app).unwrap();
@@ -585,9 +596,9 @@ impl BufferView {
if self.single_line {
ctx.propagate_action();
} else {
let mut selections = self.selections(ctx.app()).to_vec();
let mut selections = self.selections(ctx.as_ref()).to_vec();
{
let app = ctx.app();
let app = ctx.as_ref();
let buffer = self.buffer.read(app);
let map = self.display_map.read(app);
for selection in &mut selections {
@@ -607,9 +618,9 @@ impl BufferView {
if self.single_line {
ctx.propagate_action();
} else {
let mut selections = self.selections(ctx.app()).to_vec();
let mut selections = self.selections(ctx.as_ref()).to_vec();
{
let app = ctx.app();
let app = ctx.as_ref();
let map = self.display_map.read(app);
for selection in &mut selections {
let start = selection.start.to_display_point(map, app).unwrap();
@@ -636,9 +647,9 @@ impl BufferView {
if self.single_line {
ctx.propagate_action();
} else {
let mut selections = self.selections(ctx.app()).to_vec();
let mut selections = self.selections(ctx.as_ref()).to_vec();
{
let app = ctx.app();
let app = ctx.as_ref();
let buffer = self.buffer.read(app);
let map = self.display_map.read(app);
for selection in &mut selections {
@@ -781,7 +792,7 @@ impl BufferView {
let mut fold_ranges = Vec::new();
let app = ctx.app();
let app = ctx.as_ref();
let map = self.display_map.read(app);
for selection in self.selections(app) {
let (start, end) = selection.display_range(map, app).sorted();
@@ -811,7 +822,7 @@ impl BufferView {
pub fn unfold(&mut self, _: &(), ctx: &mut ViewContext<Self>) {
use super::RangeExt;
let app = ctx.app();
let app = ctx.as_ref();
let map = self.display_map.read(app);
let buffer = self.buffer.read(app);
let ranges = self
@@ -895,7 +906,7 @@ impl BufferView {
self.display_map.update(ctx, |map, ctx| {
let buffer = self.buffer.read(ctx);
let ranges = self
.selections(ctx.app())
.selections(ctx.as_ref())
.iter()
.map(|s| s.range(buffer))
.collect::<Vec<_>>();
@@ -1410,7 +1421,7 @@ mod tests {
.unwrap();
view.fold(&(), ctx);
assert_eq!(
view.text(ctx.app()),
view.text(ctx.as_ref()),
"
impl Foo {
// Hello!
@@ -1431,7 +1442,7 @@ mod tests {
view.fold(&(), ctx);
assert_eq!(
view.text(ctx.app()),
view.text(ctx.as_ref()),
"
impl Foo {…
}
@@ -1441,7 +1452,7 @@ mod tests {
view.unfold(&(), ctx);
assert_eq!(
view.text(ctx.app()),
view.text(ctx.as_ref()),
"
impl Foo {
// Hello!
@@ -1461,7 +1472,7 @@ mod tests {
);
view.unfold(&(), ctx);
assert_eq!(view.text(ctx.app()), buffer.read(ctx).text());
assert_eq!(view.text(ctx.as_ref()), buffer.read(ctx).text());
});
});
}
@@ -1488,12 +1499,12 @@ mod tests {
view.update(app, |view, ctx| {
view.move_down(&(), ctx);
assert_eq!(
view.selection_ranges(ctx.app()),
view.selection_ranges(ctx.as_ref()),
&[DisplayPoint::new(1, 0)..DisplayPoint::new(1, 0)]
);
view.move_right(&(), ctx);
assert_eq!(
view.selection_ranges(ctx.app()),
view.selection_ranges(ctx.as_ref()),
&[DisplayPoint::new(1, 4)..DisplayPoint::new(1, 4)]
);
Ok::<(), Error>(())
zed/src/editor/display_map/mod.rs
+4 -4
View File
@@ -29,7 +29,7 @@ impl DisplayMap {
DisplayMap {
buffer: buffer.clone(),
fold_map: FoldMap::new(buffer, ctx.app()),
fold_map: FoldMap::new(buffer, ctx.as_ref()),
tab_size,
}
}
@@ -39,7 +39,7 @@ impl DisplayMap {
ranges: impl IntoIterator<Item = Range<T>>,
ctx: &mut ModelContext<Self>,
) -> Result<()> {
self.fold_map.fold(ranges, ctx.app())?;
self.fold_map.fold(ranges, ctx.as_ref())?;
ctx.notify();
Ok(())
}
@@ -49,7 +49,7 @@ impl DisplayMap {
ranges: impl IntoIterator<Item = Range<T>>,
ctx: &mut ModelContext<Self>,
) -> Result<()> {
self.fold_map.unfold(ranges, ctx.app())?;
self.fold_map.unfold(ranges, ctx.as_ref())?;
ctx.notify();
Ok(())
}
@@ -125,7 +125,7 @@ impl DisplayMap {
fn handle_buffer_event(&mut self, event: &buffer::Event, ctx: &mut ModelContext<Self>) {
match event {
buffer::Event::Edited(edits) => self.fold_map.apply_edits(edits, ctx.app()).unwrap(),
buffer::Event::Edited(edits) => self.fold_map.apply_edits(edits, ctx.as_ref()).unwrap(),
_ => {}
}
}