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

Allow readding inlays with existing ids, move inlay types

Browse source
This commit is contained in:
Kirill Bulatov 2023-06-16 23:59:22 +03:00
parent 49c00fd571
commit 8f68688a64
6 changed files with 247 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/editor/src/display_map.rs
View file

@ -4,10 +4,7 @@ mod inlay_map;
mod tab_map;
mod wrap_map;
use crate::{
inlay_cache::{InlayId, InlayProperties},
Anchor, AnchorRangeExt, MultiBuffer, MultiBufferSnapshot, ToOffset, ToPoint,
};
use crate::{Anchor, AnchorRangeExt, MultiBuffer, MultiBufferSnapshot, ToOffset, ToPoint};
pub use block_map::{BlockMap, BlockPoint};
use collections::{HashMap, HashSet};
use fold_map::FoldMap;
@ -31,6 +28,8 @@ pub use block_map::{
BlockDisposition, BlockId, BlockProperties, BlockStyle, RenderBlock, TransformBlock,
};
pub use self::inlay_map::{Inlay, InlayId, InlayProperties};
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum FoldStatus {
Folded,
@ -243,10 +242,14 @@ impl DisplayMap {
.update(cx, |map, cx| map.set_wrap_width(width, cx))
}
pub fn current_inlays(&self) -> impl Iterator<Item = &Inlay> {
self.inlay_map.current_inlays()
}
pub fn splice_inlays<T: Into<Rope>>(
&mut self,
to_remove: Vec<InlayId>,
to_insert: Vec<InlayProperties<T>>,
to_insert: Vec<(Option<InlayId>, InlayProperties<T>)>,
cx: &mut ModelContext<Self>,
) -> Vec<InlayId> {
if to_remove.is_empty() && to_insert.is_empty() {