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

Unify text and inlay highlights

Browse source
This commit is contained in:
Kirill Bulatov 2023-08-22 22:38:49 +03:00
parent 420f8b7b15
commit 12ffbe54fb
9 changed files with 76 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/editor/src/display_map/block_map.rs
View file

@ -1,6 +1,6 @@
use super::{
wrap_map::{self, WrapEdit, WrapPoint, WrapSnapshot},
InlayHighlights, TextHighlights,
TextHighlights,
};
use crate::{Anchor, Editor, ExcerptId, ExcerptRange, ToPoint as _};
use collections::{Bound, HashMap, HashSet};
@ -579,7 +579,6 @@ impl BlockSnapshot {
None,
None,
None,
None,
)
.map(|chunk| chunk.text)
.collect()
@ -590,7 +589,6 @@ impl BlockSnapshot {
rows: Range<u32>,
language_aware: bool,
text_highlights: Option<&'a TextHighlights>,
inlay_highlights: Option<&'a InlayHighlights>,
inlay_highlight_style: Option<HighlightStyle>,
suggestion_highlight_style: Option<HighlightStyle>,
) -> BlockChunks<'a> {
@ -625,7 +623,6 @@ impl BlockSnapshot {
input_start..input_end,
language_aware,
text_highlights,
inlay_highlights,
inlay_highlight_style,
suggestion_highlight_style,
),
@ -1507,7 +1504,6 @@ mod tests {
None,
None,
None,
None,
)
.map(|chunk| chunk.text)
.collect::<String>();