Skip to content

Commit 6482866

Browse files
authored
Merge pull request #122 from Shopify/revert-diff-thing
Revert "fix shadowenv_data parts parse"
2 parents f098445 + 4c16ec0 commit 6482866

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

src/diff.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,8 @@ fn run_with_logger(
3232
color: bool,
3333
shadowenv_data: String,
3434
) -> i32 {
35-
let mut parts = shadowenv_data.splitn(3, ':');
35+
let mut parts = shadowenv_data.splitn(2, ':');
3636
let _prev_hash = parts.next();
37-
let _prev_dirs = parts.next().unwrap_or("[]");
3837
let json_data = parts.next().unwrap_or("{}");
3938
let shadowenv_data = undo::Data::from_str(json_data).unwrap();
4039
let mut scalars = shadowenv_data
@@ -155,7 +154,7 @@ mod tests {
155154
("VAR_C".to_string(), "/added:/existent".to_string()),
156155
];
157156

158-
let data = r#"62b0b9f86cda84d4:[]:{"scalars":[],"lists":[{"name":"VAR_C","additions":["/added"],"deletions":["/removed"]},{"name":"VAR_B","additions":["/added"],"deletions":[]},{"name":"VAR_A","additions":["/added"],"deletions":[]}]}"#;
157+
let data = r#"62b0b9f86cda84d4:{"scalars":[],"lists":[{"name":"VAR_C","additions":["/added"],"deletions":["/removed"]},{"name":"VAR_B","additions":["/added"],"deletions":[]},{"name":"VAR_A","additions":["/added"],"deletions":[]}]}"#;
159158
let result = run_with_logger(&mut logger, env_vars, false, false, data.to_string());
160159

161160
let expected: Vec<_> = [

src/prompt_widget.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ pub fn run(shadowenv_data: String) -> i32 {
33
print!("\x1b[38;5;245m░\x1b[0m");
44
}
55
0
6-
}
6+
}

0 commit comments

Comments
 (0)