hakowork/rojo
3
0
Fork 0
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-10-23 05:51:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor file path handling in JobThreadContext to support combined rename and ClassName changes

Browse source 
- Updated the logic to use the effective file path when handling script-to-script transitions, ensuring that the correct path is used even after a rename operation.
- Enhanced the test suite with a new test case for combined rename and ClassName changes, verifying that the extension change is applied correctly after a file rename.
- Improved comments for clarity on the renaming process and its implications for file handling during updates.
This commit is contained in:
Joe 2026-02-05 21:19:18 -06:00
parent 9c92204956
commit 5b2ea2a23f
2 changed files with 73 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/change_processor.rs
View file

@ -654,21 +654,29 @@ impl JobThreadContext {
"ModuleScript" | "Script" | "LocalScript"
);
if old_is_script && new_is_script && path.exists() {
// If a rename handler already moved the file,
// use the new path instead of the stale
// instigating_source path.
let effective_path = overridden_source_path
.as_deref()
.unwrap_or(path.as_path());
if old_is_script && new_is_script && effective_path.exists() {
// Script-to-script transition: rename the file extension.
// For directory-format scripts, the path is the directory
// (e.g., src/MyModule/), not the init file inside. We must
// find and rename the init file, not the directory.
// Resolve the actual file to rename. For directories,
// find the init file inside; for files, use directly.
let init_result = if path.is_dir() {
Self::find_init_file(path)
.map(|f| (f.clone(), path.to_path_buf()))
let init_result = if effective_path.is_dir() {
Self::find_init_file(effective_path)
.map(|f| (f.clone(), effective_path.to_path_buf()))
} else {
Some((
path.clone(),
path.parent()
.unwrap_or(path.as_path())
effective_path.to_path_buf(),
effective_path
.parent()
.unwrap_or(effective_path)
.to_path_buf(),
))
};