mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-05 23:51:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Clean up util::paths (#7536)

Browse source 
This PR cleans up the path definitions in `util::paths` following the
Linux merge.

We were using a bunch of target-specific compilation that made these
declarations kind of messy, when really we can limit the conditional
compilation to just the base directories that we use as the basis for
the other directories.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2024-02-07 21:01:45 -05:00 committed by GitHub
parent 7b03e977e4
commit ccc6d76708
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
crates/util/src/paths.rs
View file

@ -12,47 +12,27 @@ lazy_static::lazy_static! {
pub static ref CONVERSATIONS_DIR: PathBuf = CONFIG_DIR.join("conversations");
pub static ref EMBEDDINGS_DIR: PathBuf = CONFIG_DIR.join("embeddings");
pub static ref THEMES_DIR: PathBuf = CONFIG_DIR.join("themes");
pub static ref LOGS_DIR: PathBuf = if cfg!(target_os="macos") {
pub static ref LOGS_DIR: PathBuf = if cfg!(target_os = "macos") {
HOME.join("Library/Logs/Zed")
} else {
CONFIG_DIR.join("logs")
};
pub static ref SUPPORT_DIR: PathBuf = if cfg!(target_os="macos") {
pub static ref SUPPORT_DIR: PathBuf = if cfg!(target_os = "macos") {
HOME.join("Library/Application Support/Zed")
} else {
CONFIG_DIR.join("support")
CONFIG_DIR.clone()
};
pub static ref EXTENSIONS_DIR: PathBuf = if cfg!(target_os="macos") {
HOME.join("Library/Application Support/Zed/extensions")
} else {
CONFIG_DIR.join("extensions")
};
pub static ref LANGUAGES_DIR: PathBuf = if cfg!(target_os="macos") {
HOME.join("Library/Application Support/Zed/languages")
} else {
CONFIG_DIR.join("languages")
};
pub static ref COPILOT_DIR: PathBuf = if cfg!(target_os="macos") {
HOME.join("Library/Application Support/Zed/copilot")
} else {
CONFIG_DIR.join("copilot")
};
pub static ref DEFAULT_PRETTIER_DIR: PathBuf = if cfg!(target_os="macos") {
HOME.join("Library/Application Support/Zed/prettier")
} else {
CONFIG_DIR.join("prettier")
};
pub static ref DB_DIR: PathBuf = if cfg!(target_os="macos") {
HOME.join("Library/Application Support/Zed/db")
} else {
CONFIG_DIR.join("db")
};
pub static ref CRASHES_DIR: PathBuf = if cfg!(target_os="macos") {
pub static ref EXTENSIONS_DIR: PathBuf = SUPPORT_DIR.join("extensions");
pub static ref LANGUAGES_DIR: PathBuf = SUPPORT_DIR.join("languages");
pub static ref COPILOT_DIR: PathBuf = SUPPORT_DIR.join("copilot");
pub static ref DEFAULT_PRETTIER_DIR: PathBuf = SUPPORT_DIR.join("prettier");
pub static ref DB_DIR: PathBuf = SUPPORT_DIR.join("db");
pub static ref CRASHES_DIR: PathBuf = if cfg!(target_os = "macos") {
HOME.join("Library/Logs/DiagnosticReports")
} else {
CONFIG_DIR.join("crashes")
};
pub static ref CRASHES_RETIRED_DIR: PathBuf = if cfg!(target_os="macos") {
pub static ref CRASHES_RETIRED_DIR: PathBuf = if cfg!(target_os = "macos") {
HOME.join("Library/Logs/DiagnosticReports/Retired")
} else {
CRASHES_DIR.join("retired")
@ -65,16 +45,6 @@ lazy_static::lazy_static! {
pub static ref LOCAL_SETTINGS_RELATIVE_PATH: &'static Path = Path::new(".zed/settings.json");
}
pub mod legacy {
use std::path::PathBuf;
lazy_static::lazy_static! {
static ref CONFIG_DIR: PathBuf = super::HOME.join(".zed");
pub static ref SETTINGS: PathBuf = CONFIG_DIR.join("settings.json");
pub static ref KEYMAP: PathBuf = CONFIG_DIR.join("keymap.json");
}
}
pub trait PathExt {
fn compact(&self) -> PathBuf;
fn icon_suffix(&self) -> Option<&str>;