holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests 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

8
crates/nu-command/src/default_context.rs
View File

@ -1,10 +1,8 @@
use nu_protocol::engine::{EngineState, StateWorkingSet};
use std::path::Path;
use crate::*;
pub fn create_default_context(cwd: impl AsRef<Path>) -> EngineState {
pub fn create_default_context() -> EngineState {
let mut engine_state = EngineState::new();
let delta = {
@ -433,7 +431,9 @@ pub fn create_default_context(cwd: impl AsRef<Path>) -> EngineState {
working_set.render()
};
let _ = engine_state.merge_delta(delta, None, &cwd);
if let Err(err) = engine_state.merge_delta(delta) {
eprintln!("Error creating default context: {:?}", err);
}
engine_state
}