2b7c086 · helix · git.iko.soy

fix: Expand tilde first, then deal with relative paths

Otherwise the ~ gets treated as a relative path. Fixes #1107

commit2b7c0866538676de4e5738d82e450163ff733104 authorBlaž Hrastnik <blaz@mxxn.io> dateFri 19 Nov 2021, 12:06 (5 years ago) parentf2b4ff2

2 files changed+3−6

unifiedsplit

helix-core/src/path.rs+2−2

@@ -40,7 +40,6 @@ pub fn expand_tilde(path: &Path) -> PathBuf {

4040/// needs to improve on.

4141/// Copied from cargo: <https://github.com/rust-lang/cargo/blob/070e459c2d8b79c5b2ac5218064e7603329c92ae/crates/cargo-util/src/paths.rs#L81>

4242pub fn get_normalized_path(path: &Path) -> PathBuf {

43− let path = expand_tilde(path);

4443 let mut components = path.components().peekable();

4544 let mut ret = if let Some(c @ Component::Prefix(..)) = components.peek().cloned() {

4645 components.next();

@@ -72,10 +71,11 @@ pub fn get_normalized_path(path: &Path) -> PathBuf {

7271/// This function is used instead of `std::fs::canonicalize` because we don't want to verify

7372/// here if the path exists, just normalize it's components.

7473pub fn get_canonicalized_path(path: &Path) -> std::io::Result<PathBuf> {

74+ let path = expand_tilde(path);

7575 let path = if path.is_relative() {

7676 std::env::current_dir().map(|current_dir| current_dir.join(path))?

7777 } else {

78− path.to_path_buf()

78+ path

7979 };

8080

8181 Ok(get_normalized_path(path.as_path()))

helix-term/src/commands.rs+1−4

@@ -1767,11 +1767,8 @@ mod cmd {

17671767 args: &[&str],

17681768 _event: PromptEvent,

17691769 ) -> anyhow::Result<()> {

1770− use helix_core::path::expand_tilde;

17711770 let path = args.get(0).context("wrong argument count")?;

1772− let _ = cx

1773− .editor

1774− .open(expand_tilde(Path::new(path)), Action::Replace)?;

1771+ let _ = cx.editor.open(path.into(), Action::Replace)?;

17751772 Ok(())

17761773 }

17771774