From 1f916e65cff4459698d465b2f4558da1e1bf6e44 Mon Sep 17 00:00:00 2001
From: Michael Davis
Date: Tue, 16 Jan 2024 13:59:48 -0500
Subject: Create helix-stdx crate for stdlib extensions

helix-stdx is meant to carry extensions to the stdlib or low-level
dependencies that are useful in all other crates. This commit starts
with all of the path functions from helix-core and the CWD tracking that
lived in helix-loader.

The CWD tracking in helix-loader was previously unable to call the
canonicalization functions in helix-core. Switching to our custom
canonicalization code should make no noticeable difference though
since `std::env::current_dir` returns a canonicalized path with
symlinks resolved (at least on unix).
---
 helix-term/src/main.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'helix-term/src/main.rs')

diff --git a/helix-term/src/main.rs b/helix-term/src/main.rs
index a62c54a4..132ee796 100644
--- a/helix-term/src/main.rs
+++ b/helix-term/src/main.rs
@@ -118,16 +118,16 @@ FLAGS:
 
     // Before setting the working directory, resolve all the paths in args.files
     for (path, _) in args.files.iter_mut() {
-        *path = helix_core::path::get_canonicalized_path(path);
+        *path = helix_stdx::path::canonicalize(&path);
     }
 
     // NOTE: Set the working directory early so the correct configuration is loaded. Be aware that
     // Application::new() depends on this logic so it must be updated if this changes.
     if let Some(path) = &args.working_directory {
-        helix_loader::set_current_working_dir(path)?;
+        helix_stdx::env::set_current_working_dir(path)?;
     } else if let Some((path, _)) = args.files.first().filter(|p| p.0.is_dir()) {
         // If the first file is a directory, it will be the working directory unless -w was specified
-        helix_loader::set_current_working_dir(path)?;
+        helix_stdx::env::set_current_working_dir(path)?;
     }
 
     let config = match Config::load_default() {
-- 
cgit v1.2.3-70-g09d2