forked from extern/nushell
Fix tilde-expansion for multi-byte unicode chars (#10434)
<!-- if this PR closes one or more issues, you can automatically link the PR with them by using one of the [*linking keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword), e.g. - this PR should close #xxxx - fixes #xxxx you can also mention related issues, PRs or discussions! --> # Description <!-- Thank you for improving Nushell. Please, check our [contributing guide](../CONTRIBUTING.md) and talk to the core team before making major changes. Description of your pull request goes here. **Provide examples and/or screenshots** if your changes affect the user experience. --> Fixes #10365 Use bytes() instead of chars() to get an actual index that can be used with file.split_at(). utf8 is safe to process bytewise, since an ascii character can never be mistaken for a non-ascii character # User-Facing Changes <!-- List of all changes that impact the user experience here. This helps us keep track of breaking changes. --> # Tests + Formatting - [x] Don't forget to add tests that cover your changes. Make sure you've run and fixed any issues with these commands: - [x] `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - [x] `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to check that you're using the standard code style - [x] `cargo test --workspace` to check that all tests pass (on Windows make sure to [enable developer mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging)) - [x] `cargo run -- -c "use std testing; testing run-tests --path crates/nu-std"` to run the tests for the standard library <!-- > **Note** > from `nushell` you can also use the `toolkit` as follows > ```bash > use toolkit.nu # or use an `env_change` hook to activate it automatically > toolkit check pr > ``` --> # After Submitting <!-- If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date. -->
This commit is contained in:
parent
bf40f035f6
commit
e1c6be0682
@ -22,9 +22,9 @@ fn expand_tilde_with_home(path: impl AsRef<Path>, home: Option<PathBuf>) -> Path
|
|||||||
|
|
||||||
if !path.starts_with("~") {
|
if !path.starts_with("~") {
|
||||||
let string = path.to_string_lossy();
|
let string = path.to_string_lossy();
|
||||||
let mut path_as_string = string.as_ref().chars();
|
let mut path_as_string = string.as_ref().bytes();
|
||||||
return match path_as_string.next() {
|
return match path_as_string.next() {
|
||||||
Some('~') => expand_tilde_with_another_user_home(path),
|
Some(b'~') => expand_tilde_with_another_user_home(path),
|
||||||
_ => path.into(),
|
_ => path.into(),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@ -121,7 +121,7 @@ fn expand_tilde_with_another_user_home(path: &Path) -> PathBuf {
|
|||||||
return match path.to_str() {
|
return match path.to_str() {
|
||||||
Some(file_path) => {
|
Some(file_path) => {
|
||||||
let mut file = file_path.to_string();
|
let mut file = file_path.to_string();
|
||||||
match file_path.chars().position(|c| c == '/' || c == '\\') {
|
match file_path.find(|c| c == '/' || c == '\\') {
|
||||||
None => {
|
None => {
|
||||||
file.remove(0);
|
file.remove(0);
|
||||||
user_home_dir(&file)
|
user_home_dir(&file)
|
||||||
@ -185,6 +185,22 @@ mod tests {
|
|||||||
check_expanded("~//test/");
|
check_expanded("~//test/");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn string_with_tilde_other_user() {
|
||||||
|
let s = "~someone/test/";
|
||||||
|
let expected = format!("{FALLBACK_USER_HOME_BASE_DIR}/someone/test/");
|
||||||
|
|
||||||
|
assert_eq!(expand_tilde(Path::new(s)), PathBuf::from(expected));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn string_with_multi_byte_chars() {
|
||||||
|
let s = "~あ/";
|
||||||
|
let expected = format!("{FALLBACK_USER_HOME_BASE_DIR}/あ/");
|
||||||
|
|
||||||
|
assert_eq!(expand_tilde(Path::new(s)), PathBuf::from(expected));
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn does_not_expand_tilde_if_tilde_is_not_first_character() {
|
fn does_not_expand_tilde_if_tilde_is_not_first_character() {
|
||||||
check_not_expanded("1~1");
|
check_not_expanded("1~1");
|
||||||
|
Loading…
Reference in New Issue
Block a user