
This is the core change: https://github.com/zed-industries/zed/pull/26758/files#diff-044302c0d57147af17e68a0009fee3e8dcdfb4f32c27a915e70cfa80e987f765R1052 TODO: - [x] Use AsyncFn instead of Fn() -> Future in GPUI spawn methods - [x] Implement it in the whole app - [x] Implement it in the debugger - [x] Glance at the RPC crate, and see if those box future methods can be switched over. Answer: It can't directly, as you can't make an AsyncFn* into a trait object. There's ways around that, but they're all more complex than just keeping the code as is. - [ ] Fix platform specific code Release Notes: - N/A
226 lines
7.3 KiB
Rust
226 lines
7.3 KiB
Rust
use std::{ops::Range, time::Duration};
|
|
|
|
use collections::HashSet;
|
|
use gpui::{App, AppContext as _, Context, Task, Window};
|
|
use language::language_settings::language_settings;
|
|
use multi_buffer::{IndentGuide, MultiBufferRow};
|
|
use text::{LineIndent, Point};
|
|
use util::ResultExt;
|
|
|
|
use crate::{DisplaySnapshot, Editor};
|
|
|
|
struct ActiveIndentedRange {
|
|
row_range: Range<MultiBufferRow>,
|
|
indent: LineIndent,
|
|
}
|
|
|
|
#[derive(Default)]
|
|
pub struct ActiveIndentGuidesState {
|
|
pub dirty: bool,
|
|
cursor_row: MultiBufferRow,
|
|
pending_refresh: Option<Task<()>>,
|
|
active_indent_range: Option<ActiveIndentedRange>,
|
|
}
|
|
|
|
impl ActiveIndentGuidesState {
|
|
pub fn should_refresh(&self) -> bool {
|
|
self.pending_refresh.is_none() && self.dirty
|
|
}
|
|
}
|
|
|
|
impl Editor {
|
|
pub fn indent_guides(
|
|
&self,
|
|
visible_buffer_range: Range<MultiBufferRow>,
|
|
snapshot: &DisplaySnapshot,
|
|
cx: &mut Context<Editor>,
|
|
) -> Option<Vec<IndentGuide>> {
|
|
let show_indent_guides = self.should_show_indent_guides().unwrap_or_else(|| {
|
|
if let Some(buffer) = self.buffer().read(cx).as_singleton() {
|
|
language_settings(
|
|
buffer.read(cx).language().map(|l| l.name()),
|
|
buffer.read(cx).file(),
|
|
cx,
|
|
)
|
|
.indent_guides
|
|
.enabled
|
|
} else {
|
|
true
|
|
}
|
|
});
|
|
|
|
if !show_indent_guides {
|
|
return None;
|
|
}
|
|
|
|
Some(indent_guides_in_range(
|
|
self,
|
|
visible_buffer_range,
|
|
self.should_show_indent_guides() == Some(true),
|
|
snapshot,
|
|
cx,
|
|
))
|
|
}
|
|
|
|
pub fn find_active_indent_guide_indices(
|
|
&mut self,
|
|
indent_guides: &[IndentGuide],
|
|
snapshot: &DisplaySnapshot,
|
|
window: &mut Window,
|
|
cx: &mut Context<Editor>,
|
|
) -> Option<HashSet<usize>> {
|
|
let selection = self.selections.newest::<Point>(cx);
|
|
let cursor_row = MultiBufferRow(selection.head().row);
|
|
|
|
let state = &mut self.active_indent_guides_state;
|
|
|
|
if state
|
|
.active_indent_range
|
|
.as_ref()
|
|
.map(|active_indent_range| {
|
|
should_recalculate_indented_range(
|
|
state.cursor_row,
|
|
cursor_row,
|
|
active_indent_range,
|
|
snapshot,
|
|
)
|
|
})
|
|
.unwrap_or(true)
|
|
{
|
|
state.dirty = true;
|
|
} else {
|
|
state.cursor_row = cursor_row;
|
|
}
|
|
|
|
if state.should_refresh() {
|
|
state.cursor_row = cursor_row;
|
|
state.dirty = false;
|
|
|
|
if indent_guides.is_empty() {
|
|
return None;
|
|
}
|
|
|
|
let snapshot = snapshot.clone();
|
|
|
|
let task = cx.background_spawn(resolve_indented_range(snapshot, cursor_row));
|
|
|
|
// Try to resolve the indent in a short amount of time, otherwise move it to a background task.
|
|
match cx
|
|
.background_executor()
|
|
.block_with_timeout(Duration::from_micros(200), task)
|
|
{
|
|
Ok(result) => state.active_indent_range = result,
|
|
Err(future) => {
|
|
state.pending_refresh = Some(cx.spawn_in(window, async move |editor, cx| {
|
|
let result = cx.background_spawn(future).await;
|
|
editor
|
|
.update(cx, |editor, _| {
|
|
editor.active_indent_guides_state.active_indent_range = result;
|
|
editor.active_indent_guides_state.pending_refresh = None;
|
|
})
|
|
.log_err();
|
|
}));
|
|
return None;
|
|
}
|
|
}
|
|
}
|
|
|
|
let active_indent_range = state.active_indent_range.as_ref()?;
|
|
|
|
let candidates = indent_guides
|
|
.iter()
|
|
.enumerate()
|
|
.filter(|(_, indent_guide)| {
|
|
indent_guide.indent_level() == active_indent_range.indent.len(indent_guide.tab_size)
|
|
});
|
|
|
|
let mut matches = HashSet::default();
|
|
for (i, indent) in candidates {
|
|
// Find matches that are either an exact match, partially on screen, or inside the enclosing indent
|
|
if active_indent_range.row_range.start <= indent.end_row
|
|
&& indent.start_row <= active_indent_range.row_range.end
|
|
{
|
|
matches.insert(i);
|
|
}
|
|
}
|
|
Some(matches)
|
|
}
|
|
}
|
|
|
|
pub fn indent_guides_in_range(
|
|
editor: &Editor,
|
|
visible_buffer_range: Range<MultiBufferRow>,
|
|
ignore_disabled_for_language: bool,
|
|
snapshot: &DisplaySnapshot,
|
|
cx: &App,
|
|
) -> Vec<IndentGuide> {
|
|
let start_anchor = snapshot
|
|
.buffer_snapshot
|
|
.anchor_before(Point::new(visible_buffer_range.start.0, 0));
|
|
let end_anchor = snapshot
|
|
.buffer_snapshot
|
|
.anchor_after(Point::new(visible_buffer_range.end.0, 0));
|
|
|
|
snapshot
|
|
.buffer_snapshot
|
|
.indent_guides_in_range(start_anchor..end_anchor, ignore_disabled_for_language, cx)
|
|
.filter(|indent_guide| {
|
|
if editor.is_buffer_folded(indent_guide.buffer_id, cx) {
|
|
return false;
|
|
}
|
|
|
|
let start = MultiBufferRow(indent_guide.start_row.0.saturating_sub(1));
|
|
// Filter out indent guides that are inside a fold
|
|
// All indent guides that are starting "offscreen" have a start value of the first visible row minus one
|
|
// Therefore checking if a line is folded at first visible row minus one causes the other indent guides that are not related to the fold to disappear as well
|
|
let is_folded = snapshot.is_line_folded(start);
|
|
let line_indent = snapshot.line_indent_for_buffer_row(start);
|
|
let contained_in_fold =
|
|
line_indent.len(indent_guide.tab_size) <= indent_guide.indent_level();
|
|
!(is_folded && contained_in_fold)
|
|
})
|
|
.collect()
|
|
}
|
|
|
|
async fn resolve_indented_range(
|
|
snapshot: DisplaySnapshot,
|
|
buffer_row: MultiBufferRow,
|
|
) -> Option<ActiveIndentedRange> {
|
|
snapshot
|
|
.buffer_snapshot
|
|
.enclosing_indent(buffer_row)
|
|
.await
|
|
.map(|(row_range, indent)| ActiveIndentedRange { row_range, indent })
|
|
}
|
|
|
|
fn should_recalculate_indented_range(
|
|
prev_row: MultiBufferRow,
|
|
new_row: MultiBufferRow,
|
|
current_indent_range: &ActiveIndentedRange,
|
|
snapshot: &DisplaySnapshot,
|
|
) -> bool {
|
|
if prev_row.0 == new_row.0 {
|
|
return false;
|
|
}
|
|
if snapshot.buffer_snapshot.is_singleton() {
|
|
if !current_indent_range.row_range.contains(&new_row) {
|
|
return true;
|
|
}
|
|
|
|
let old_line_indent = snapshot.buffer_snapshot.line_indent_for_row(prev_row);
|
|
let new_line_indent = snapshot.buffer_snapshot.line_indent_for_row(new_row);
|
|
|
|
if old_line_indent.is_line_empty()
|
|
|| new_line_indent.is_line_empty()
|
|
|| old_line_indent != new_line_indent
|
|
|| snapshot.buffer_snapshot.max_point().row == new_row.0
|
|
{
|
|
return true;
|
|
}
|
|
|
|
let next_line_indent = snapshot.buffer_snapshot.line_indent_for_row(new_row + 1);
|
|
next_line_indent.is_line_empty() || next_line_indent != old_line_indent
|
|
} else {
|
|
true
|
|
}
|
|
}
|