suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add more ways to detect runtime directory

pull/231/head
Wojciech Kępka 2021-06-12 08:30:55 +02:00 committed by Ivan Tham
parent c754df12b3
commit 716067ba05
2 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
helix-core/src/lib.rs
View File

@ -17,6 +17,9 @@ mod state;
pub mod syntax; pub mod syntax;
mod transaction; mod transaction;
static RUNTIME_DIR: once_cell::sync::Lazy<std::path::PathBuf> =
once_cell::sync::Lazy::new(runtime_dir);
pub fn find_first_non_whitespace_char(line: RopeSlice) -> Option<usize> { pub fn find_first_non_whitespace_char(line: RopeSlice) -> Option<usize> {
line.chars().position(|ch| !ch.is_whitespace()) line.chars().position(|ch| !ch.is_whitespace())
} }
@ -47,15 +50,26 @@ pub fn find_root(root: Option<&str>) -> Option<std::path::PathBuf> {
#[cfg(not(embed_runtime))] #[cfg(not(embed_runtime))]
pub fn runtime_dir() -> std::path::PathBuf { pub fn runtime_dir() -> std::path::PathBuf {
// runtime env var || dir where binary is located if let Ok(dir) = std::env::var("HELIX_RUNTIME") {
std::env::var("HELIX_RUNTIME") return dir.into();
.map(|path| path.into()) }
.unwrap_or_else(|_| {
std::env::current_exe() const RT_DIR: &str = "runtime";
.ok() let conf_dir = config_dir().join(RT_DIR);
.and_then(|path| path.parent().map(|path| path.to_path_buf())) if conf_dir.exists() {
.unwrap() return conf_dir;
}) }
if let Ok(dir) = std::env::var("CARGO_MANIFEST_DIR") {
// this is the directory of the crate being run by cargo, we need the workspace path so we take the parent
return std::path::PathBuf::from(dir).parent().unwrap().join(RT_DIR);
}
// fallback to location of the executable being run
std::env::current_exe()
.ok()
.and_then(|path| path.parent().map(|path| path.to_path_buf()))
.unwrap()
} }
pub fn config_dir() -> std::path::PathBuf { pub fn config_dir() -> std::path::PathBuf {

6
helix-core/src/syntax.rs
View File

@ -76,8 +76,10 @@ pub struct IndentQuery {
#[cfg(not(feature = "embed_runtime"))] #[cfg(not(feature = "embed_runtime"))]
fn load_runtime_file(language: &str, filename: &str) -> Result<String, std::io::Error> { fn load_runtime_file(language: &str, filename: &str) -> Result<String, std::io::Error> {
let root = crate::runtime_dir(); let path = crate::RUNTIME_DIR
let path = root.join("queries").join(language).join(filename); .join("queries")
.join(language)
.join(filename);
std::fs::read_to_string(&path) std::fs::read_to_string(&path)
} }