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 | 71 |
1 files changed, 24 insertions, 47 deletions
diff --git a/helix-loader/src/lib.rs b/helix-loader/src/lib.rs index 705e016b..f8fac670 100644 --- a/helix-loader/src/lib.rs +++ b/helix-loader/src/lib.rs @@ -53,7 +53,7 @@ fn prioritize_runtime_dirs() -> Vec<PathBuf> { rt_dirs.push(conf_rt_dir); if let Ok(dir) = std::env::var("HELIX_RUNTIME") { - let dir = path::expand_tilde(Path::new(&dir)); + let dir = path::expand_tilde(dir); rt_dirs.push(path::normalize(dir)); } @@ -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 } @@ -107,8 +107,8 @@ fn find_runtime_file(rel_path: &Path) -> Option<PathBuf> { /// The valid runtime directories are searched in priority order and the first /// file found to exist is returned, otherwise the path to the final attempt /// that failed. -pub fn runtime_file(rel_path: impl AsRef<Path>) -> PathBuf { - find_runtime_file(rel_path.as_ref()).unwrap_or_else(|| { +pub fn runtime_file(rel_path: &Path) -> PathBuf { + find_runtime_file(rel_path).unwrap_or_else(|| { RUNTIME_DIRS .last() .map(|dir| dir.join(rel_path)) @@ -126,7 +126,7 @@ pub fn config_dir() -> PathBuf { pub fn cache_dir() -> PathBuf { // TODO: allow env var override - let strategy = choose_base_strategy().expect("Unable to find the cache directory!"); + let strategy = choose_base_strategy().expect("Unable to find the config directory!"); let mut path = strategy.cache_dir(); path.push("helix"); path @@ -154,36 +154,17 @@ pub fn default_log_file() -> PathBuf { /// Merge two TOML documents, merging values from `right` onto `left` /// -/// `merge_depth` sets the nesting depth up to which values are merged instead -/// of overridden. -/// -/// When a table exists in both `left` and `right`, the merged table consists of -/// all keys in `left`'s table unioned with all keys in `right` with the values -/// of `right` being merged recursively onto values of `left`. -/// -/// `crate::merge_toml_values(a, b, 3)` combines, for example: +/// When an array exists in both `left` and `right`, `right`'s array is +/// used. When a table exists in both `left` and `right`, the merged table +/// consists of all keys in `left`'s table unioned with all keys in `right` +/// with the values of `right` being merged recursively onto values of +/// `left`. /// -/// b: -/// ```toml -/// [[language]] -/// name = "toml" -/// language-server = { command = "taplo", args = ["lsp", "stdio"] } -/// ``` -/// a: -/// ```toml -/// [[language]] -/// language-server = { command = "/usr/bin/taplo" } -/// ``` -/// -/// into: -/// ```toml -/// [[language]] -/// name = "toml" -/// language-server = { command = "/usr/bin/taplo" } -/// ``` -/// -/// thus it overrides the third depth-level of b with values of a if they exist, -/// but otherwise merges their values +/// `merge_toplevel_arrays` controls whether a top-level array in the TOML +/// document is merged instead of overridden. This is useful for TOML +/// documents that use a top-level array of values like the `languages.toml`, +/// where one usually wants to override or add to the array instead of +/// replacing it altogether. pub fn merge_toml_values(left: toml::Value, right: toml::Value, merge_depth: usize) -> toml::Value { use toml::Value; @@ -193,6 +174,11 @@ pub fn merge_toml_values(left: toml::Value, right: toml::Value, merge_depth: usi match (left, right) { (Value::Array(mut left_items), Value::Array(right_items)) => { + // The top-level arrays should be merged but nested arrays should + // act as overrides. For the `languages.toml` config, this means + // that you can specify a sub-set of languages in an overriding + // `languages.toml` but that nested arrays like Language Server + // arguments are replaced instead of merged. if merge_depth > 0 { left_items.reserve(right_items.len()); for rvalue in right_items { @@ -239,27 +225,18 @@ pub fn merge_toml_values(left: toml::Value, right: toml::Value, merge_depth: usi /// Used as a ceiling dir for LSP root resolution, the filepicker and potentially as a future filewatching root /// /// This function starts searching the FS upward from the CWD -/// and returns the first directory that contains either `.git`, `.svn`, `.jj` or `.helix`. +/// and returns the first directory that contains either `.git` or `.helix`. /// If no workspace was found returns (CWD, true). /// 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() { - if ancestor.join(".git").exists() - || ancestor.join(".svn").exists() - || ancestor.join(".jj").exists() - || ancestor.join(".helix").exists() - { + for ancestor in current_dir.ancestors() { + if ancestor.join(".git").exists() || ancestor.join(".helix").exists() { return (ancestor.to_owned(), false); } } - (dir.to_owned(), true) + (current_dir, true) } fn default_config_file() -> PathBuf { |