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

Define empty theme for tests regardless of cargo features

Browse source 
Co-authored-by: Kirill <kirill@zed.dev>
This commit is contained in:
Max Brunsfeld 2023-05-18 09:01:38 -07:00
parent 5c437e2098
commit 71ad7e7612
3 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
crates/file_finder/Cargo.toml
View file

@ -26,6 +26,7 @@ postage.workspace = true
gpui = { path = "../gpui", features = ["test-support"] } gpui = { path = "../gpui", features = ["test-support"] }
language = { path = "../language", features = ["test-support"] } language = { path = "../language", features = ["test-support"] }
workspace = { path = "../workspace", features = ["test-support"] } workspace = { path = "../workspace", features = ["test-support"] }
theme = { path = "../theme", features = ["test-support"] }
serde_json.workspace = true serde_json.workspace = true
ctor.workspace = true ctor.workspace = true

1
crates/settings/src/settings_file.rs
View file

@ -24,7 +24,6 @@ pub fn default_settings() -> Cow<'static, str> {
} }
} }
#[cfg(any(test, feature = "test-support"))]
pub const EMPTY_THEME_NAME: &'static str = "empty-theme"; pub const EMPTY_THEME_NAME: &'static str = "empty-theme";
#[cfg(any(test, feature = "test-support"))] #[cfg(any(test, feature = "test-support"))]

1
crates/theme/src/theme_registry.rs
View file

@ -30,7 +30,6 @@ impl ThemeRegistry {
font_cache, font_cache,
}); });
#[cfg(any(test, feature = "test-support"))]
this.themes.lock().insert( this.themes.lock().insert(
settings::EMPTY_THEME_NAME.to_string(), settings::EMPTY_THEME_NAME.to_string(),
gpui::fonts::with_font_cache(this.font_cache.clone(), || { gpui::fonts::with_font_cache(this.font_cache.clone(), || {