Builds on top of existing work from #2249, but here's a showcase: https://github.com/zed-industries/zed/assets/53836821/4b346965-6654-496c-b379-75425d9b493f TODO: - [x] handle line wrapping - [x] implement handling in multibuffer (crashes currently) - [x] add configuration option - [x] new theme properties? What colors to use? - [x] Possibly support indents with different colors or background colors - [x] investigate edge cases (e.g. indent guides and folds continue on empty lines even if the next indent is different) - [x] add more tests (also test `find_active_indent_index`) - [x] docs (will do in a follow up PR) - [x] benchmark performance impact Release Notes: - Added indent guides ([#5373](https://github.com/zed-industries/zed/issues/5373)) --------- Co-authored-by: Nate Butler <1714999+iamnbutler@users.noreply.github.com> Co-authored-by: Remco <djsmits12@gmail.com>
165 lines
5.3 KiB
Rust
165 lines
5.3 KiB
Rust
use std::{ops::Range, time::Duration};
|
|
|
|
use collections::HashSet;
|
|
use gpui::{AppContext, Task};
|
|
use language::BufferRow;
|
|
use multi_buffer::{MultiBufferIndentGuide, MultiBufferRow};
|
|
use text::{BufferId, Point};
|
|
use ui::ViewContext;
|
|
use util::ResultExt;
|
|
|
|
use crate::{DisplaySnapshot, Editor};
|
|
|
|
struct ActiveIndentedRange {
|
|
buffer_id: BufferId,
|
|
row_range: Range<BufferRow>,
|
|
indent: u32,
|
|
}
|
|
|
|
#[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, cursor_row: MultiBufferRow) -> bool {
|
|
self.pending_refresh.is_none() && (self.cursor_row != cursor_row || self.dirty)
|
|
}
|
|
}
|
|
|
|
impl Editor {
|
|
pub fn indent_guides(
|
|
&self,
|
|
visible_buffer_range: Range<MultiBufferRow>,
|
|
snapshot: &DisplaySnapshot,
|
|
cx: &AppContext,
|
|
) -> Option<Vec<MultiBufferIndentGuide>> {
|
|
if self.show_indent_guides == Some(false) {
|
|
return None;
|
|
}
|
|
|
|
let settings = self.buffer.read(cx).settings_at(0, cx);
|
|
if settings.indent_guides.enabled {
|
|
Some(indent_guides_in_range(visible_buffer_range, snapshot, cx))
|
|
} else {
|
|
None
|
|
}
|
|
}
|
|
|
|
pub fn find_active_indent_guide_indices(
|
|
&mut self,
|
|
indent_guides: &[MultiBufferIndentGuide],
|
|
snapshot: &DisplaySnapshot,
|
|
cx: &mut ViewContext<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.cursor_row != cursor_row {
|
|
state.cursor_row = cursor_row;
|
|
state.dirty = true;
|
|
}
|
|
|
|
if state.should_refresh(cursor_row) {
|
|
let snapshot = snapshot.clone();
|
|
state.dirty = false;
|
|
|
|
let task = cx
|
|
.background_executor()
|
|
.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(|editor, mut cx| async move {
|
|
let result = cx.background_executor().spawn(future).await;
|
|
editor
|
|
.update(&mut 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.buffer_id == active_indent_range.buffer_id
|
|
&& indent_guide.indent_width() == active_indent_range.indent
|
|
});
|
|
|
|
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(
|
|
visible_buffer_range: Range<MultiBufferRow>,
|
|
snapshot: &DisplaySnapshot,
|
|
cx: &AppContext,
|
|
) -> Vec<MultiBufferIndentGuide> {
|
|
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, cx)
|
|
.into_iter()
|
|
.filter(|indent_guide| {
|
|
// Filter out indent guides that are inside a fold
|
|
!snapshot.is_line_folded(indent_guide.multibuffer_row_range.start)
|
|
})
|
|
.collect()
|
|
}
|
|
|
|
async fn resolve_indented_range(
|
|
snapshot: DisplaySnapshot,
|
|
buffer_row: MultiBufferRow,
|
|
) -> Option<ActiveIndentedRange> {
|
|
let (buffer_row, buffer_snapshot, buffer_id) =
|
|
if let Some((_, buffer_id, snapshot)) = snapshot.buffer_snapshot.as_singleton() {
|
|
(buffer_row.0, snapshot, buffer_id)
|
|
} else {
|
|
let (snapshot, point) = snapshot.buffer_snapshot.buffer_line_for_row(buffer_row)?;
|
|
|
|
let buffer_id = snapshot.remote_id();
|
|
(point.start.row, snapshot, buffer_id)
|
|
};
|
|
|
|
buffer_snapshot
|
|
.enclosing_indent(buffer_row)
|
|
.await
|
|
.map(|(row_range, indent)| ActiveIndentedRange {
|
|
row_range,
|
|
indent,
|
|
buffer_id,
|
|
})
|
|
}
|