aleleba/gridcraft
1
0
Fork 0
mirror of https://github.com/storytold/gridcraft.git synced 2026-11-02 07:06:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

Engine: a rolled-back group takes what its script runs ran out of the recording too

Browse Source 
Taking back the steps a rolled-back group recorded left what a taken-back script or macro run
ran (`Recorder::ran`) under its old index, where a later run could pick it up, and left it out of
the size count. `cut_back` now drops it with its step, moves a kept run's entry to the step's new
index and counts both again.

- Test: `a_rolled_back_script_run_takes_what_it_ran_out_of_the_recording`.
This commit is contained in:
prxnvt
2026-10-25 06:29:23 -04:00
parent 0a9305f784
commit ca2be34e8a
2 changed files with 39 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/engine/src/tests/macros.rs
+20
View File
@@ -2164,6 +2164,26 @@ fn a_script_step_that_only_opened_a_dialog_is_left_out_of_the_recording() {
assert!(recorded(&mut s, "Without").is_empty());
}
#[test]
fn a_rolled_back_script_run_takes_what_it_ran_out_of_the_recording() {
// What a recorded script run ran goes with its step when a group rollback takes the step
// back, and a kept run keeps what it ran under its new place.
let mut s = s();
s.execute("automate.newScript", json!({"name": "Mark", "commands": [{"command": "cell.set", "params": {"cell": "A1", "input": "m"}}]})).unwrap();
s.execute("macro.record", json!({"relative": false})).unwrap();
s.execute("automate.runScript", json!({"name": "Mark"})).unwrap();
let _left = s.group_begin("Left open").unwrap();
set(&mut s, "B1", "gone");
s.execute("automate.runScript", json!({"name": "Mark"})).unwrap();
s.execute("automate.stopAction", json!({})).unwrap();
let rec = s.recorder.as_ref().unwrap();
assert_eq!((rec.steps.len(), rec.ran.keys().copied().collect::<Vec<_>>()), (1, vec![0]));
s.execute("automate.runScript", json!({"name": "Mark"})).unwrap();
s.execute("macro.record", json!({"stop": true, "name": "Rec"})).unwrap();
let a1 = "cell.set {\"cell\":\"A1\",\"input\":\"m\"}";
assert_eq!(recorded(&mut s, "Rec"), [a1, a1]);
}
#[test]
fn a_script_run_records_the_state_its_toggles_set() {
let mut s = s();