andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-22 01:16:18 +04:00
Code Issues Projects Releases Wiki Activity

Set the working directory before loading the config (#8498)

Browse Source
This commit is contained in:
Bjorn Ove Hay Andersen 2023-10-09 18:38:09 +02:00 committed by GitHub
parent 5cb76e74f9
commit a857480561
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
helix-loader/src/lib.rs
View File

@ -33,9 +33,9 @@ pub fn current_working_dir() -> PathBuf {
path path
} }
pub fn set_current_working_dir(path: PathBuf) -> std::io::Result<()> { pub fn set_current_working_dir(path: impl AsRef<Path>) -> std::io::Result<()> {
let path = dunce::canonicalize(path)?; let path = dunce::canonicalize(path)?;
std::env::set_current_dir(path.clone())?; std::env::set_current_dir(&path)?;
let mut cwd = CWD.write().unwrap(); let mut cwd = CWD.write().unwrap();
*cwd = Some(path); *cwd = Some(path);
Ok(()) Ok(())
@ -280,7 +280,7 @@ fn current_dir_is_set() {
let cwd = current_working_dir(); let cwd = current_working_dir();
assert_ne!(cwd, new_path); assert_ne!(cwd, new_path);
set_current_working_dir(new_path.clone()).expect("Couldn't set new path"); set_current_working_dir(&new_path).expect("Couldn't set new path");
let cwd = current_working_dir(); let cwd = current_working_dir();
assert_eq!(cwd, new_path); assert_eq!(cwd, new_path);

5
helix-term/src/application.rs
View File

@ -156,9 +156,6 @@ pub fn new(
let editor_view = Box::new(ui::EditorView::new(Keymaps::new(keys))); let editor_view = Box::new(ui::EditorView::new(Keymaps::new(keys)));
compositor.push(editor_view); compositor.push(editor_view);
if let Some(path) = args.working_directory {
helix_loader::set_current_working_dir(path)?
}
if args.load_tutor { if args.load_tutor {
let path = helix_loader::runtime_file(Path::new("tutor")); let path = helix_loader::runtime_file(Path::new("tutor"));
editor.open(&path, Action::VerticalSplit)?; editor.open(&path, Action::VerticalSplit)?;
@ -167,7 +164,7 @@ pub fn new(
} else if !args.files.is_empty() { } else if !args.files.is_empty() {
let first = &args.files[0].0; // we know it's not empty let first = &args.files[0].0; // we know it's not empty
if first.is_dir() { if first.is_dir() {
helix_loader::set_current_working_dir(first.clone())?; // NOTE: The working directory is already set to args.files[0] in main()
editor.new_file(Action::VerticalSplit); editor.new_file(Action::VerticalSplit);
let picker = ui::file_picker(".".into(), &config.load().editor); let picker = ui::file_picker(".".into(), &config.load().editor);
compositor.push(Box::new(overlaid(picker))); compositor.push(Box::new(overlaid(picker)));

8
helix-term/src/main.rs
View File

@ -115,6 +115,14 @@ async fn main_impl() -> Result<i32> {
setup_logging(args.verbosity).context("failed to initialize logging")?; setup_logging(args.verbosity).context("failed to initialize logging")?;
// 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, true)) = args.files.first().map(|(path, _)| (path, path.is_dir())) {
helix_loader::set_current_working_dir(path)?;
} else if let Some(path) = &args.working_directory {
helix_loader::set_current_working_dir(path)?;
}
let config = match Config::load_default() { let config = match Config::load_default() {
Ok(config) => config, Ok(config) => config,
Err(ConfigLoadError::Error(err)) if err.kind() == std::io::ErrorKind::NotFound => { Err(ConfigLoadError::Error(err)) if err.kind() == std::io::ErrorKind::NotFound => {