diff options
author | David Sherret <dsherret@users.noreply.github.com> | 2024-07-01 18:17:17 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-07-01 18:17:17 -0400 |
commit | 6f30ef88a24e4c463d26c34f25b024fb48f3aea2 (patch) | |
tree | 357632b15f66281882f43a29647313e5ca33edc5 /tests/util | |
parent | b0cd43b5f3d4af8a6dca9d7a3fbeb281a9c39c19 (diff) |
fix(windows): check USERPROFILE env var for finding home directory (#24384)
Diffstat (limited to 'tests/util')
-rw-r--r-- | tests/util/server/src/lib.rs | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/tests/util/server/src/lib.rs b/tests/util/server/src/lib.rs index a7f4fb447..d23fde0dd 100644 --- a/tests/util/server/src/lib.rs +++ b/tests/util/server/src/lib.rs @@ -750,12 +750,14 @@ pub fn wildcard_match_detailed( } None => { let was_wildcard_or_line = was_last_wildcard || was_last_wildline; - let mut max_found_index = 0; + let mut max_search_text_found_index = 0; + let mut max_current_text_found_index = 0; for (index, _) in search_text.char_indices() { let sub_string = &search_text[..index]; if let Some(found_index) = current_text.find(sub_string) { if was_wildcard_or_line || found_index == 0 { - max_found_index = index; + max_search_text_found_index = index; + max_current_text_found_index = found_index; } else { break; } @@ -763,11 +765,11 @@ pub fn wildcard_match_detailed( break; } } - if !was_wildcard_or_line && max_found_index > 0 { + if !was_wildcard_or_line && max_search_text_found_index > 0 { output_lines.push(format!( "<FOUND>{}</FOUND>", colors::gray(annotate_whitespace( - &search_text[..max_found_index] + &search_text[..max_search_text_found_index] )) )); } @@ -777,18 +779,19 @@ pub fn wildcard_match_detailed( if was_wildcard_or_line { search_text } else { - &search_text[max_found_index..] + &search_text[max_search_text_found_index..] }, ))); - if was_wildcard_or_line && max_found_index > 0 { + if was_wildcard_or_line && max_search_text_found_index > 0 { output_lines.push(format!( "==== MAX FOUND ====\n{}", colors::red(annotate_whitespace( - &search_text[..max_found_index] + &search_text[..max_search_text_found_index] )) )); } - let actual_next_text = ¤t_text[max_found_index..]; + let actual_next_text = + ¤t_text[max_current_text_found_index..]; let max_next_text_len = 40; let next_text_len = std::cmp::min(max_next_text_len, actual_next_text.len()); |