Improve exit behavior

This makes so that nushell kills all active jobs when exiting in
both interactive and noninteractive form, including when
exiting from natural cause (i.e `main` function return).

Author: cosineblast

crates/nu-cli/src/repl.rs

@@ -697,7 +697,8 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
 
             cleanup_exit((), engine_state, 0);
 
-            return (false, stack, line_editor);
+            // if cleanup_exit didn't exit, we should keep running
+            return (true, stack, line_editor);
         }
         Err(err) => {
             let message = err.to_string();

crates/nu-command/src/experimental/job_spawn.rs

@@ -79,7 +79,6 @@ impl Command for JobSpawn {
                 .run_with_input(Value::nothing(head).into_pipeline_data())
                 .and_then(|data| data.into_value(head))
                 .unwrap_or_else(|err| {
-
                     if !job_state.signals().interrupted() {
                         report_shell_error(&job_state, &err);
                     }

crates/nu-engine/src/exit.rs

@@ -12,24 +12,26 @@ use nu_protocol::engine::EngineState;
 pub fn cleanup_exit<T>(tag: T, engine_state: &EngineState, exit_code: i32) -> T {
     let mut jobs = engine_state.jobs.lock().expect("failed to lock job table");
 
-    if engine_state.is_interactive && jobs.iter().next().is_some() {
-        if engine_state.exit_warning_given.load(Ordering::SeqCst) {
-            let _ = jobs.kill_all();
-        } else {
-            let job_count = jobs.iter().count();
+    if engine_state.is_interactive
+        && jobs.iter().next().is_some()
+        && !engine_state.exit_warning_given.load(Ordering::SeqCst)
+    {
+        let job_count = jobs.iter().count();
 
-            println!("There are still {} background jobs running.", job_count);
+        println!("There are still background jobs running ({}).", job_count);
 
-            println!("Running `exit` a second time will kill all of them.");
+        println!("Running `exit` a second time will kill all of them.");
 
-            engine_state
-                .exit_warning_given
-                .store(true, Ordering::SeqCst);
+        engine_state
+            .exit_warning_given
+            .store(true, Ordering::SeqCst);
 
-            return tag;
-        }
+        return tag;
     }
 
+    let _ = jobs.kill_all();
+
     drop(tag);
+
     std::process::exit(exit_code);
 }

crates/nu-protocol/src/engine/jobs.rs

@@ -20,7 +20,7 @@ impl Default for Jobs {
         Self {
             next_job_id: 1,
             last_frozen_job_id: None,
-            jobs: HashMap::default()
+            jobs: HashMap::default(),
         }
     }
 }

src/main.rs

@@ -21,7 +21,7 @@ use command::gather_commandline_args;
 use log::{trace, Level};
 use miette::Result;
 use nu_cli::gather_parent_env_vars;
-use nu_engine::convert_env_values;
+use nu_engine::{convert_env_values, exit::cleanup_exit};
 use nu_lsp::LanguageServer;
 use nu_path::canonicalize_with;
 use nu_protocol::{
@@ -489,6 +489,8 @@ fn main() -> Result<()> {
             input,
             entire_start_time,
         );
+
+        cleanup_exit(0, &engine_state, 0);
     } else if !script_name.is_empty() {
         run_file(
             &mut engine_state,
@@ -499,6 +501,8 @@ fn main() -> Result<()> {
             args_to_script,
             input,
         );
+
+        cleanup_exit(0, &engine_state, 0);
     } else {
         // Environment variables that apply only when in REPL
         engine_state.add_env_var("PROMPT_INDICATOR".to_string(), Value::test_string("> "));
@@ -534,7 +538,9 @@ fn main() -> Result<()> {
             stack,
             parsed_nu_cli_args,
             entire_start_time,
-        )?
+        )?;
+
+        cleanup_exit(0, &engine_state, 0);
     }
 
     Ok(())