Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'helix-loader/src/lib.rs')
| -rw-r--r-- | helix-loader/src/lib.rs | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/helix-loader/src/lib.rs b/helix-loader/src/lib.rs index 705e016b..54980dd7 100644 --- a/helix-loader/src/lib.rs +++ b/helix-loader/src/lib.rs @@ -64,6 +64,7 @@ fn prioritize_runtime_dirs() -> Vec<PathBuf> { if let Some(dir) = std::option_env!("HELIX_DEFAULT_RUNTIME") { rt_dirs.push(dir.into()); } + // fallback to location of the executable being run // canonicalize the path in case the executable is symlinked let exe_rt_dir = std::env::current_exe() @@ -72,7 +73,6 @@ fn prioritize_runtime_dirs() -> Vec<PathBuf> { .and_then(|path| path.parent().map(|path| path.to_path_buf().join(RT_DIR))) .unwrap(); rt_dirs.push(exe_rt_dir); - rt_dirs.push(PathBuf::from("/usr/lib/helix/runtime/")); rt_dirs } @@ -244,12 +244,7 @@ pub fn merge_toml_values(left: toml::Value, right: toml::Value, merge_depth: usi /// Otherwise (workspace, false) is returned pub fn find_workspace() -> (PathBuf, bool) { let current_dir = current_working_dir(); - find_workspace_in(current_dir) -} - -pub fn find_workspace_in(dir: impl AsRef<Path>) -> (PathBuf, bool) { - let dir = dir.as_ref(); - for ancestor in dir.ancestors() { + for ancestor in current_dir.ancestors() { if ancestor.join(".git").exists() || ancestor.join(".svn").exists() || ancestor.join(".jj").exists() @@ -259,7 +254,7 @@ pub fn find_workspace_in(dir: impl AsRef<Path>) -> (PathBuf, bool) { } } - (dir.to_owned(), true) + (current_dir, true) } fn default_config_file() -> PathBuf { |