Public/nushell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up

Browse Source
This commit is contained in:
Andy Gayton 2024-06-23 09:35:48 -04:00
parent f3830de758
commit 98c6ce2d94
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main.rs
View File

@ -25,8 +25,8 @@ use nu_cmd_base::util::get_init_cwd;
use nu_lsp::LanguageServer;
use nu_path::canonicalize_with;
use nu_protocol::{
engine::EngineState, report_error_new, ByteStream, PipelineData, ShellError, Span, Spanned,
Value,
engine::{ctrlc, EngineState},
report_error_new, ByteStream, PipelineData, ShellError, Span, Spanned, Value,
};
use nu_std::load_standard_library;
use nu_utils::utils::perf;
@ -75,7 +75,9 @@ fn main() -> Result<()> {
}
// TODO: make this conditional in the future
ctrlc_protection(&mut engine_state);
let ctrlc_bool = Arc::new(AtomicBool::new(false));
let ctrlc_handlers = ctrlc::Handlers::new();
ctrlc_protection(&mut engine_state, &ctrlc_bool, &ctrlc_handlers);
// Begin: Default NU_LIB_DIRS, NU_PLUGIN_DIRS
// Set default NU_LIB_DIRS and NU_PLUGIN_DIRS here before the env.nu is processed. If
@ -460,11 +462,7 @@ fn main() -> Result<()> {
);
}
let ctrlc = engine_state
.ctrlc
.clone()
.unwrap_or_else(|| Arc::new(AtomicBool::new(false)));
LanguageServer::initialize_stdio_connection()?.serve_requests(engine_state, ctrlc)?
LanguageServer::initialize_stdio_connection()?.serve_requests(engine_state, ctrlc_bool)?
} else if let Some(commands) = parsed_nu_cli_args.commands.clone() {
run_commands(
&mut engine_state,

21
src/signals.rs
View File

@ -4,20 +4,21 @@ use std::sync::{
Arc,
};
pub(crate) fn ctrlc_protection(engine_state: &mut EngineState) {
let ctrlc = Arc::new(AtomicBool::new(false));
let handlers = Handlers::new();
pub(crate) fn ctrlc_protection(
engine_state: &mut EngineState,
ctrlc_bool: &Arc<AtomicBool>,
ctrlc_handlers: &Handlers,
) {
{
let ctrlc = ctrlc.clone();
let handlers = handlers.clone();
let ctrlc_bool = ctrlc_bool.clone();
let ctrlc_handlers = ctrlc_handlers.clone();
ctrlc::set_handler(move || {
ctrlc.store(true, Ordering::SeqCst);
handlers.run();
ctrlc_bool.store(true, Ordering::SeqCst);
ctrlc_handlers.run();
})
.expect("Error setting Ctrl-C handler");
}
engine_state.ctrlc = Some(ctrlc);
engine_state.ctrlc_handlers = Some(handlers);
engine_state.ctrlc = Some(ctrlc_bool.clone());
engine_state.ctrlc_handlers = Some(ctrlc_handlers.clone());
}