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

List path dependencies first in all Cargo.toml files

Browse source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Max Brunsfeld 2021-10-04 15:36:52 -07:00
parent 1d97f08901
commit 75cf2488db
9 changed files with 82 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/editor/Cargo.toml
View file

@ -7,10 +7,13 @@ edition = "2021"
test-support = ["buffer/test-support"]
[dependencies]
anyhow = "1.0"
buffer = { path = "../buffer" }
clock = { path = "../clock" }
gpui = { path = "../gpui" }
sum_tree = { path = "../sum_tree" }
util = { path = "../util" }
anyhow = "1.0"
lazy_static = "1.4"
log = "0.4"
parking_lot = "0.11"
@ -18,12 +21,11 @@ postage = { version = "0.4", features = ["futures-traits"] }
serde = { version = "1", features = ["derive", "rc"] }
smallvec = { version = "1.6", features = ["union"] }
smol = "1.2"
sum_tree = { path = "../sum_tree" }
util = { path = "../util" }
[dev-dependencies]
buffer = { path = "../buffer", features = ["test-support"] }
rand = "0.8"
unindent = "0.1.7"
tree-sitter = "0.19"
tree-sitter-rust = "0.19"
buffer = { path = "../buffer", features = ["test-support"] }

62
crates/editor/src/lib.rs
View file

@ -5,8 +5,6 @@ pub mod movement;
#[cfg(test)]
mod test;
// use crate::{project::ProjectPath, settings::Settings, theme::Theme, workspace};
use buffer::*;
use clock::ReplicaId;
pub use display_map::DisplayPoint;
@ -2451,36 +2449,6 @@ impl Snapshot {
}
impl EditorStyle {
#[cfg(any(test, feature = "test-support"))]
pub fn test(font_cache: &gpui::FontCache) -> Self {
let font_family_name = Arc::from("Monaco");
let font_properties = Default::default();
let font_family_id = font_cache.load_family(&[&font_family_name]).unwrap();
let font_id = font_cache
.select_font(font_family_id, &font_properties)
.unwrap();
Self {
text: TextStyle {
font_family_name,
font_family_id,
font_id,
font_size: 14.,
color: Color::from_u32(0xff0000ff),
font_properties,
underline: false,
},
placeholder_text: None,
background: Default::default(),
gutter_background: Default::default(),
active_line_background: Default::default(),
line_number: Default::default(),
line_number_active: Default::default(),
selection: Default::default(),
guest_selections: Default::default(),
syntax: Default::default(),
}
}
fn placeholder_text(&self) -> &TextStyle {
self.placeholder_text.as_ref().unwrap_or(&self.text)
}
@ -2491,7 +2459,35 @@ impl EditorSettings {
pub fn test(cx: &AppContext) -> Self {
Self {
tab_size: 4,
style: EditorStyle::test(cx.font_cache()),
style: {
let font_cache: &gpui::FontCache = cx.font_cache();
let font_family_name = Arc::from("Monaco");
let font_properties = Default::default();
let font_family_id = font_cache.load_family(&[&font_family_name]).unwrap();
let font_id = font_cache
.select_font(font_family_id, &font_properties)
.unwrap();
EditorStyle {
text: TextStyle {
font_family_name,
font_family_id,
font_id,
font_size: 14.,
color: Color::from_u32(0xff0000ff),
font_properties,
underline: false,
},
placeholder_text: None,
background: Default::default(),
gutter_background: Default::default(),
active_line_background: Default::default(),
line_number: Default::default(),
line_number_active: Default::default(),
selection: Default::default(),
guest_selections: Default::default(),
syntax: Default::default(),
}
},
}
}
}