From c2a40d9d5229c701fa1a6d0fb80ce4ba86e8dc0c Mon Sep 17 00:00:00 2001
From: Kirawi
Date: Sun, 17 Apr 2022 23:10:51 -0400
Subject: Add support for local language configuration (#1249)

* add local configuration

* move config loading to Application::new

* simplify find_root_impl---
 helix-core/src/lib.rs | 38 +++-----------------------------------
 1 file changed, 3 insertions(+), 35 deletions(-)

(limited to 'helix-core/src/lib.rs')

diff --git a/helix-core/src/lib.rs b/helix-core/src/lib.rs
index 0ae68f91..02341265 100644
--- a/helix-core/src/lib.rs
+++ b/helix-core/src/lib.rs
@@ -46,41 +46,9 @@ pub fn find_first_non_whitespace_char(line: RopeSlice) -> Option<usize> {
 /// * Top-most folder containing a root marker if not git repository detected
 /// * Current working directory as fallback
 pub fn find_root(root: Option<&str>, root_markers: &[String]) -> Option<std::path::PathBuf> {
-    let current_dir = std::env::current_dir().expect("unable to determine current directory");
-
-    let root = match root {
-        Some(root) => {
-            let root = std::path::Path::new(root);
-            if root.is_absolute() {
-                root.to_path_buf()
-            } else {
-                current_dir.join(root)
-            }
-        }
-        None => current_dir.clone(),
-    };
-
-    let mut top_marker = None;
-    for ancestor in root.ancestors() {
-        for marker in root_markers {
-            if ancestor.join(marker).exists() {
-                top_marker = Some(ancestor);
-                break;
-            }
-        }
-        // don't go higher than repo
-        if ancestor.join(".git").is_dir() {
-            // Use workspace if detected from marker
-            return Some(top_marker.unwrap_or(ancestor).to_path_buf());
-        }
-    }
-
-    // In absence of git repo, use workspace if detected
-    if top_marker.is_some() {
-        top_marker.map(|a| a.to_path_buf())
-    } else {
-        Some(current_dir)
-    }
+    helix_loader::find_root_impl(root, root_markers)
+        .first()
+        .cloned()
 }
 
 pub use ropey::{Rope, RopeBuilder, RopeSlice};
-- 
cgit v1.2.3-70-g09d2