mirror of
https://github.com/zed-industries/zed.git
synced 2025-02-08 19:43:11 +00:00
Add DisplayMap::highlighted_chunks_at(row)
Note that this API doesn't take a DisplayPoint: it could but it makes things a bit harder on the implementation side and we don't really need it anyway, as text is laid out on a line-by-line basis anyway.
This commit is contained in:
parent
4ddf10967e
commit
4b8805bad2
1 changed files with 67 additions and 1 deletions
|
@ -4,7 +4,7 @@ use super::{buffer, Anchor, Bias, Buffer, Edit, Point, ToOffset, ToPoint};
|
||||||
pub use fold_map::BufferRows;
|
pub use fold_map::BufferRows;
|
||||||
use fold_map::{FoldMap, FoldMapSnapshot};
|
use fold_map::{FoldMap, FoldMapSnapshot};
|
||||||
use gpui::{AppContext, ModelHandle};
|
use gpui::{AppContext, ModelHandle};
|
||||||
use std::ops::Range;
|
use std::{mem, ops::Range};
|
||||||
|
|
||||||
pub struct DisplayMap {
|
pub struct DisplayMap {
|
||||||
buffer: ModelHandle<Buffer>,
|
buffer: ModelHandle<Buffer>,
|
||||||
|
@ -151,6 +151,23 @@ impl DisplayMapSnapshot {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn highlighted_chunks_at<'a>(
|
||||||
|
&'a self,
|
||||||
|
row: u32,
|
||||||
|
app: &'a AppContext,
|
||||||
|
) -> HighlightedChunks<'a> {
|
||||||
|
let point = DisplayPoint::new(row, 0);
|
||||||
|
let offset = self.folds_snapshot.to_display_offset(point, app);
|
||||||
|
HighlightedChunks {
|
||||||
|
fold_chunks: self.folds_snapshot.highlighted_chunks_at(offset, app),
|
||||||
|
column: 0,
|
||||||
|
tab_size: self.tab_size,
|
||||||
|
chunk: "",
|
||||||
|
capture_ix: None,
|
||||||
|
skip_leading_tab: false,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub fn chars_at<'a>(
|
pub fn chars_at<'a>(
|
||||||
&'a self,
|
&'a self,
|
||||||
point: DisplayPoint,
|
point: DisplayPoint,
|
||||||
|
@ -336,6 +353,55 @@ impl<'a> Iterator for Chunks<'a> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub struct HighlightedChunks<'a> {
|
||||||
|
fold_chunks: fold_map::HighlightedChunks<'a>,
|
||||||
|
chunk: &'a str,
|
||||||
|
capture_ix: Option<usize>,
|
||||||
|
column: usize,
|
||||||
|
tab_size: usize,
|
||||||
|
skip_leading_tab: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<'a> Iterator for HighlightedChunks<'a> {
|
||||||
|
type Item = (&'a str, Option<usize>);
|
||||||
|
|
||||||
|
fn next(&mut self) -> Option<Self::Item> {
|
||||||
|
if self.chunk.is_empty() {
|
||||||
|
if let Some((chunk, capture_ix)) = self.fold_chunks.next() {
|
||||||
|
self.chunk = chunk;
|
||||||
|
self.capture_ix = capture_ix;
|
||||||
|
if self.skip_leading_tab {
|
||||||
|
self.chunk = &self.chunk[1..];
|
||||||
|
self.skip_leading_tab = false;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for (ix, c) in self.chunk.char_indices() {
|
||||||
|
match c {
|
||||||
|
'\t' => {
|
||||||
|
if ix > 0 {
|
||||||
|
let (prefix, suffix) = self.chunk.split_at(ix);
|
||||||
|
self.chunk = suffix;
|
||||||
|
return Some((prefix, self.capture_ix));
|
||||||
|
} else {
|
||||||
|
self.chunk = &self.chunk[1..];
|
||||||
|
let len = self.tab_size - self.column % self.tab_size;
|
||||||
|
self.column += len;
|
||||||
|
return Some((&SPACES[0..len], self.capture_ix));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
'\n' => self.column = 0,
|
||||||
|
_ => self.column += 1,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Some((mem::take(&mut self.chunk), self.capture_ix.take()))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub fn expand_tabs(chars: impl Iterator<Item = char>, column: usize, tab_size: usize) -> usize {
|
pub fn expand_tabs(chars: impl Iterator<Item = char>, column: usize, tab_size: usize) -> usize {
|
||||||
let mut expanded_chars = 0;
|
let mut expanded_chars = 0;
|
||||||
let mut expanded_bytes = 0;
|
let mut expanded_bytes = 0;
|
||||||
|
|
Loading…
Reference in a new issue