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

Make config default if broken (#482)

Browse Source 
* Make config default if broken

* Make config default if broken
This commit is contained in:
JT
2021-12-13 16:16:51 +13:00
committed by GitHub
parent 90ddb23492
commit 2013e9300a
26 changed files with 47 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main.rs
View File

@ -13,7 +13,7 @@ use nu_parser::parse;
use nu_protocol::{
ast::Call,
engine::{EngineState, Stack, StateWorkingSet},
PipelineData, ShellError, Span, Value, CONFIG_VARIABLE_ID,
Config, PipelineData, ShellError, Span, Value, CONFIG_VARIABLE_ID,
};
use reedline::{Completer, CompletionActionHandler, DefaultPrompt, LineBuffer, Prompt};
use std::{
@ -140,6 +140,16 @@ fn main() -> Result<()> {
},
);
let config = match stack.get_config() {
Ok(config) => config,
Err(e) => {
let working_set = StateWorkingSet::new(&engine_state);
report_error(&working_set, &e);
Config::default()
}
};
match eval_block(
&engine_state,
&mut stack,
@ -147,7 +157,6 @@ fn main() -> Result<()> {
PipelineData::new(Span::unknown()),
) {
Ok(pipeline_data) => {
let config = stack.get_config()?;
for item in pipeline_data {
if let Value::Error { error } = item {
let working_set = StateWorkingSet::new(&engine_state);
@ -191,7 +200,6 @@ fn main() -> Result<()> {
PipelineData::new(Span::unknown()),
) {
Ok(pipeline_data) => {
let config = stack.get_config()?;
for item in pipeline_data {
if let Value::Error { error } = item {
let working_set = StateWorkingSet::new(&engine_state);
@ -289,7 +297,15 @@ fn main() -> Result<()> {
}
loop {
let config = stack.get_config()?;
let config = match stack.get_config() {
Ok(config) => config,
Err(e) => {
let working_set = StateWorkingSet::new(&engine_state);
report_error(&working_set, &e);
Config::default()
}
};
//Reset the ctrl-c handler
ctrlc.store(false, Ordering::SeqCst);
@ -374,7 +390,7 @@ fn print_pipeline_data(
// If the table function is in the declarations, then we can use it
// to create the table value that will be printed in the terminal
let config = stack.get_config()?;
let config = stack.get_config().unwrap_or_default();
match engine_state.find_decl("table".as_bytes()) {
Some(decl_id) => {