Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Split helix_core::find_root and helix_loader::find_local_config_dirs #3929

Merged
merged 2 commits into from
Sep 23, 2022

Commits on Sep 22, 2022

  1. Split helix_core::find_root and helix_loader::find_local_config_dirs

    The documentation of find_root described the following priority for
    detecting a project root:
    - Top-most folder containing a root marker in current git repository
    - Git repository root if no marker detected
    - Top-most folder containing a root marker if not git repository detected
    - Current working directory as fallback
    
    The commit contained in helix-editor#1249
    extracted and changed the implementation of find_root in find_root_impl,
    actually reversing its result order (since that is the order that made
    sense for the local configuration merge, from innermost to outermost
    ancestors).
    
    Since the two uses of find_root_impl have different requirements (and
    it's not a matter of reversing the order of results since, e.g., the top
    repository dir should be used by find_root only if there's not marker in
    other dirs), this PR splits the two implementations in two different
    specialized functions.
    
    In doing so, find_root_impl is removed and the implementation is moved
    back in find_root, moving it closer to the documented behaviour thus
    making it easier to verify it's actually correct
    rbino committed Sep 22, 2022
    Configuration menu
    Copy the full SHA
    deda72e View commit details
    Browse the repository at this point in the history
  2. helix-core: remove Option from find_root return type

    It always returns some result, so Option is not needed
    rbino committed Sep 22, 2022
    Configuration menu
    Copy the full SHA
    6859755 View commit details
    Browse the repository at this point in the history