extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-09 10:45:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Split merging of parser delta and stack environment (#6005)

Browse Source 
* Remove comment

* Split delta and environment merging

* Move table mode to a more logical place

* Cleanup

* Merge environment after reading default_env.nu

* Fmt
This commit is contained in:
Jakub Žádník
2022-07-14 17:09:27 +03:00
committed by GitHub
parent d95a065e3d
commit 26f31da711
17 changed files with 172 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
crates/nu-parser/tests/test_parser.rs
View File

@ -977,8 +977,9 @@ mod input_types {
working_set.render()
};
let cwd = std::env::current_dir().expect("Could not get current working directory.");
let _ = engine_state.merge_delta(delta, None, &cwd);
engine_state
.merge_delta(delta)
.expect("Error merging delta");
}
#[test]
@ -999,7 +1000,9 @@ mod input_types {
match &expressions[0].expr {
Expr::Call(call) => {
let expected_id = working_set.find_decl(b"ls", &Type::Any).unwrap();
let expected_id = working_set
.find_decl(b"ls", &Type::Any)
.expect("Error merging delta");
assert_eq!(call.decl_id, expected_id)
}
_ => panic!("Expected expression Call not found"),
@ -1154,8 +1157,7 @@ mod input_types {
(block, working_set.render())
};
let cwd = std::env::current_dir().expect("Could not get current working directory.");
let _ = engine_state.merge_delta(delta, None, &cwd);
engine_state.merge_delta(delta).unwrap();
let expressions = &block[0];
match &expressions[3].expr {