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

Don't make fonts::Features Copy

Browse source
This commit is contained in:
Antonio Scandurra 2023-03-17 13:54:56 +01:00
parent 989c9f0196
commit 4d915f4530
13 changed files with 36 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -786,7 +786,7 @@ pub mod tests {
let buffer_start_excerpt_header_height = rng.gen_range(1..=5);
let excerpt_header_height = rng.gen_range(1..=5);
let family_id = font_cache
.load_family(&["Helvetica"], Default::default())
.load_family(&["Helvetica"], &Default::default())
.unwrap();
let font_id = font_cache
.select_font(family_id, &Default::default())
@ -1045,7 +1045,7 @@ pub mod tests {
let font_cache = cx.font_cache();
let family_id = font_cache
.load_family(&["Helvetica"], Default::default())
.load_family(&["Helvetica"], &Default::default())
.unwrap();
let font_id = font_cache
.select_font(family_id, &Default::default())
@ -1137,7 +1137,7 @@ pub mod tests {
let buffer = MultiBuffer::build_simple(&text, cx);
let family_id = cx
.font_cache()
.load_family(&["Helvetica"], Default::default())
.load_family(&["Helvetica"], &Default::default())
.unwrap();
let font_id = cx
.font_cache()
@ -1222,7 +1222,7 @@ pub mod tests {
let font_cache = cx.font_cache();
let family_id = font_cache
.load_family(&["Helvetica"], Default::default())
.load_family(&["Helvetica"], &Default::default())
.unwrap();
let font_id = font_cache
.select_font(family_id, &Default::default())
@ -1312,7 +1312,7 @@ pub mod tests {
let font_cache = cx.font_cache();
let family_id = font_cache
.load_family(&["Courier"], Default::default())
.load_family(&["Courier"], &Default::default())
.unwrap();
let font_id = font_cache
.select_font(family_id, &Default::default())
@ -1386,7 +1386,7 @@ pub mod tests {
let font_cache = cx.font_cache();
let family_id = font_cache
.load_family(&["Courier"], Default::default())
.load_family(&["Courier"], &Default::default())
.unwrap();
let font_id = font_cache
.select_font(family_id, &Default::default())
@ -1504,7 +1504,7 @@ pub mod tests {
let buffer = MultiBuffer::build_simple(text, cx);
let font_cache = cx.font_cache();
let family_id = font_cache
.load_family(&["Helvetica"], Default::default())
.load_family(&["Helvetica"], &Default::default())
.unwrap();
let font_id = font_cache
.select_font(family_id, &Default::default())
@ -1564,7 +1564,7 @@ pub mod tests {
let buffer = MultiBuffer::build_simple("aaa\n\t\tbbb", cx);
let font_cache = cx.font_cache();
let family_id = font_cache
.load_family(&["Helvetica"], Default::default())
.load_family(&["Helvetica"], &Default::default())
.unwrap();
let font_id = font_cache
.select_font(family_id, &Default::default())

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

@ -1017,7 +1017,7 @@ mod tests {
let family_id = cx
.font_cache()
.load_family(&["Helvetica"], Default::default())
.load_family(&["Helvetica"], &Default::default())
.unwrap();
let font_id = cx
.font_cache()
@ -1190,7 +1190,7 @@ mod tests {
let family_id = cx
.font_cache()
.load_family(&["Helvetica"], Default::default())
.load_family(&["Helvetica"], &Default::default())
.unwrap();
let font_id = cx
.font_cache()
@ -1249,7 +1249,7 @@ mod tests {
let tab_size = 1.try_into().unwrap();
let family_id = cx
.font_cache()
.load_family(&["Helvetica"], Default::default())
.load_family(&["Helvetica"], &Default::default())
.unwrap();
let font_id = cx
.font_cache()

2
crates/editor/src/display_map/wrap_map.rs
View file

@ -1054,7 +1054,7 @@ mod tests {
};
let tab_size = NonZeroU32::new(rng.gen_range(1..=4)).unwrap();
let family_id = font_cache
.load_family(&["Helvetica"], Default::default())
.load_family(&["Helvetica"], &Default::default())
.unwrap();
let font_id = font_cache
.select_font(family_id, &Default::default())

3
crates/editor/src/editor.rs
View file

@ -6769,7 +6769,6 @@ fn build_style(
}
} else {
let font_family_id = settings.buffer_font_family;
let font_features = settings.buffer_font_features;
let font_family_name = cx.font_cache().family_name(font_family_id).unwrap();
let font_properties = Default::default();
let font_id = font_cache
@ -6780,7 +6779,7 @@ fn build_style(
text: TextStyle {
color: settings.theme.editor.text_color,
font_family_name,
font_features,
font_features: settings.buffer_font_features.clone(),
font_family_id,
font_id,
font_size,

2
crates/editor/src/movement.rs
View file

@ -589,7 +589,7 @@ mod tests {
cx.set_global(Settings::test(cx));
let family_id = cx
.font_cache()
.load_family(&["Helvetica"], Default::default())
.load_family(&["Helvetica"], &Default::default())
.unwrap();
let font_id = cx
.font_cache()

2
crates/editor/src/test.rs
View file

@ -27,7 +27,7 @@ pub fn marked_display_snapshot(
let family_id = cx
.font_cache()
.load_family(&["Helvetica"], Default::default())
.load_family(&["Helvetica"], &Default::default())
.unwrap();
let font_id = cx
.font_cache()