mirror of
https://github.com/helix-editor/helix.git
synced 2024-09-11 10:55:45 +03:00
correctly handle opening helix inside symlinked directory (#10728)
* correctly handle opening helix inside symlinked directory * Update helix-stdx/src/env.rs --------- Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>
This commit is contained in:
parent
ff6aca12b7
commit
8444f52e9a
@ -14,13 +14,23 @@ pub fn current_working_dir() -> PathBuf {
|
||||
return path.clone();
|
||||
}
|
||||
|
||||
let path = std::env::current_dir()
|
||||
.map(crate::path::normalize)
|
||||
.expect("Couldn't determine current working directory");
|
||||
let mut cwd = CWD.write().unwrap();
|
||||
*cwd = Some(path.clone());
|
||||
// implementation of crossplatform pwd -L
|
||||
// we want pwd -L so that symlinked directories are handled correctly
|
||||
let mut cwd = std::env::current_dir().expect("Couldn't determine current working directory");
|
||||
|
||||
path
|
||||
let pwd = std::env::var_os("PWD");
|
||||
#[cfg(windows)]
|
||||
let pwd = pwd.or_else(|| std::env::var_os("CD"));
|
||||
|
||||
if let Some(pwd) = pwd.map(PathBuf::from) {
|
||||
if pwd.canonicalize().ok().as_ref() == Some(&cwd) {
|
||||
cwd = pwd;
|
||||
}
|
||||
}
|
||||
let mut dst = CWD.write().unwrap();
|
||||
*dst = Some(cwd.clone());
|
||||
|
||||
cwd
|
||||
}
|
||||
|
||||
pub fn set_current_working_dir(path: impl AsRef<Path>) -> std::io::Result<()> {
|
||||
|
Loading…
Reference in New Issue
Block a user