Skip to content

Normalize in-memory file keys to ensure consistent path handling. #862

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
moritz-gross wants to merge 1 commit into from
Closed

Normalize in-memory file keys to ensure consistent path handling. #862

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/shim_filesystem.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,17 +290,17 @@ cfg_if! {
pub fn add_in_memory_file(path: &str, content: &str) {
{
let mut files = IN_MEMORY_FILES.write().unwrap();
files.get_or_insert_with(HashMap::new).insert(path.to_string(), content.to_string());
// normalize keys the same way lookups do (on Windows, this converts '/' to '\')
files.get_or_insert_with(HashMap::new).insert(get_in_memory_key(Path::new(path)), content.to_string());
}

let path_obj = Path::new(path);
{
let mut dirs = IN_MEMORY_DIRS.write().unwrap();
let dirs = dirs.get_or_insert_with(HashSet::new);
for parent in path_obj.ancestors().skip(1) {
let parent_str = parent.to_str().unwrap_or_default();
for parent in Path::new(path).ancestors().skip(1) {
let parent_str = get_in_memory_key(parent);
if !parent_str.is_empty() {
dirs.insert(parent_str.to_string());
dirs.insert(parent_str);
}
}
}
Expand Down
Loading