Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do away with display points in toggle_code_actions

Browse source
This commit is contained in:
Piotr Osiewicz 2024-05-08 14:00:58 +02:00
parent 65f7238777
commit 68fe2bb776
2 changed files with 22 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

54
crates/editor/src/editor.rs
View file

@ -3851,22 +3851,10 @@ impl Editor {
let spawned_test_task = this.update(&mut cx, |this, cx| { let spawned_test_task = this.update(&mut cx, |this, cx| {
if this.focus_handle.is_focused(cx) { if this.focus_handle.is_focused(cx) {
let snapshot = this.snapshot(cx); let buffer_row = action
let display_row = action.deployed_from_indicator.unwrap_or_else(|| { .deployed_from_indicator
this.selections .unwrap_or_else(|| this.selections.newest::<Point>(cx).head().row);
.newest::<Point>(cx) let tasks = this.tasks.get(&buffer_row).map(|t| Arc::new(t.to_owned()));
.head()
.to_display_point(&snapshot.display_snapshot)
.row()
});
let buffer_point =
DisplayPoint::new(display_row, 0).to_point(&snapshot.display_snapshot);
let buffer_row = snapshot
.buffer_snapshot
.buffer_line_for_row(buffer_point.row)
.map(|(_, Range { start, .. })| start);
let tasks = this.tasks.get(&display_row).map(|t| Arc::new(t.to_owned()));
let (location, code_actions) = this let (location, code_actions) = this
.available_code_actions .available_code_actions
.clone() .clone()
@ -3874,7 +3862,7 @@ impl Editor {
let snapshot = location.buffer.read(cx).snapshot(); let snapshot = location.buffer.read(cx).snapshot();
let point_range = location.range.to_point(&snapshot); let point_range = location.range.to_point(&snapshot);
let point_range = point_range.start.row..=point_range.end.row; let point_range = point_range.start.row..=point_range.end.row;
if buffer_row.map_or(false, |row| point_range.contains(&row.row)) { if point_range.contains(&buffer_row) {
Some((location, code_actions)) Some((location, code_actions))
} else { } else {
None None
@ -3888,7 +3876,7 @@ impl Editor {
let buffer = location.map(|location| location.buffer).or_else(|| { let buffer = location.map(|location| location.buffer).or_else(|| {
let snapshot = this.snapshot(cx); let snapshot = this.snapshot(cx);
let (buffer_snapshot, _) = let (buffer_snapshot, _) =
snapshot.buffer_snapshot.buffer_line_for_row(display_row)?; snapshot.buffer_snapshot.buffer_line_for_row(buffer_row)?;
let buffer_id = buffer_snapshot.remote_id(); let buffer_id = buffer_snapshot.remote_id();
this.buffer().read(cx).buffer(buffer_id) this.buffer().read(cx).buffer(buffer_id)
}); });
@ -3899,22 +3887,18 @@ impl Editor {
this.discard_inline_completion(cx); this.discard_inline_completion(cx);
let task_context = tasks.as_ref().zip(this.workspace.clone()).and_then( let task_context = tasks.as_ref().zip(this.workspace.clone()).and_then(
|(tasks, (workspace, _))| { |(tasks, (workspace, _))| {
if let Some(buffer_point) = buffer_row { let position = Point::new(buffer_row, tasks.column);
let position = Point::new(buffer_point.row, tasks.column); let range_start = buffer.read(cx).anchor_at(position, Bias::Right);
let range_start = buffer.read(cx).anchor_at(position, Bias::Right); let location = Location {
let location = Location { buffer: buffer.clone(),
buffer: buffer.clone(), range: range_start..range_start,
range: range_start..range_start, };
}; workspace
workspace .update(cx, |workspace, cx| {
.update(cx, |workspace, cx| { tasks::task_context_for_location(workspace, location, cx)
tasks::task_context_for_location(workspace, location, cx) })
}) .ok()
.ok() .flatten()
.flatten()
} else {
None
}
}, },
); );
let tasks = tasks let tasks = tasks
@ -3930,7 +3914,7 @@ impl Editor {
.map(|task| (kind.clone(), task)) .map(|task| (kind.clone(), task))
}) })
.collect(), .collect(),
position: Point::new(display_row, tasks.column), position: Point::new(buffer_row, tasks.column),
}) })
}); });
let spawn_straight_away = tasks let spawn_straight_away = tasks

4
crates/editor/src/element.rs
View file

@ -4022,11 +4022,13 @@ impl Element for EditorElement {
cx, cx,
); );
if gutter_settings.code_actions { if gutter_settings.code_actions {
let newest_selection_point =
newest_selection_head.to_point(&snapshot.display_snapshot);
let has_test_indicator = self let has_test_indicator = self
.editor .editor
.read(cx) .read(cx)
.tasks .tasks
.contains_key(&newest_selection_head.row()); .contains_key(&newest_selection_point.row);
if !has_test_indicator { if !has_test_indicator {
code_actions_indicator = self.layout_code_actions_indicator( code_actions_indicator = self.layout_code_actions_indicator(
line_height, line_height,