andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-22 09:26:19 +04:00
Code Issues Projects Releases Wiki Activity

Use helix-stdx tilde expansion and normalization for HELIX_RUNTIME paths

Browse Source 
Previously this wasn't possible since helix-core depends on helix-loader,
so helix-loader couldn't use helix-core's path extensions.

We use the path normalization/canonicalization for the runtime directory
provided by the HELIX_RUNTIME environment variable. This improves a
scenario where you set a path containing a tilde. Now that path will be
expanded and normalized.
This commit is contained in:
Michael Davis 2024-01-16 14:00:06 -05:00 committed by Blaž Hrastnik
parent 1f916e65cf
commit 1bc7aac780
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@ -1114,6 +1114,7 @@ dependencies = [
"cc", "cc",
"dunce", "dunce",
"etcetera", "etcetera",
"helix-stdx",
"libloading", "libloading",
"log", "log",
"once_cell", "once_cell",

2
helix-loader/Cargo.toml
View File

@ -15,6 +15,8 @@ name = "hx-loader"
path = "src/main.rs" path = "src/main.rs"
[dependencies] [dependencies]
helix-stdx = { path = "../helix-stdx" }
anyhow = "1" anyhow = "1"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
toml = "0.7" toml = "0.7"

3
helix-loader/src/lib.rs
View File

@ -53,7 +53,8 @@ fn prioritize_runtime_dirs() -> Vec<PathBuf> {
rt_dirs.push(conf_rt_dir); rt_dirs.push(conf_rt_dir);
if let Ok(dir) = std::env::var("HELIX_RUNTIME") { if let Ok(dir) = std::env::var("HELIX_RUNTIME") {
rt_dirs.push(dir.into()); let dir = path::expand_tilde(dir);
rt_dirs.push(path::normalize(dir));
} }
// If this variable is set during build time, it will always be included // If this variable is set during build time, it will always be included