Remove vars after leaving dir

crates/nu-cli/src/cli.rs

@@ -889,7 +889,6 @@ async fn process_line(
 
             trace!("{:#?}", classified_block);
             let env = ctx.get_env();
-
             match run_block(
                 &classified_block.block,
                 ctx,

crates/nu-cli/src/env/directory_specific_environment.rs

@@ -120,4 +120,31 @@ impl DirectorySpecificEnvironment {
 
         Ok(vars_to_add)
     }
+
+    //If the user has left directories which added env vars through .nu, we clear those vars
+    pub fn env_vars_to_delete(&mut self) -> std::io::Result<Vec<String>> {
+        let current_dir = std::env::current_dir()?;
+
+        //Gather up all environment variables that should be deleted.
+        //If we are not in a directory or one of its subdirectories, mark the env_vals it maps to for removal.
+        let vars_to_delete = self.added_env_vars.iter().fold(
+            Vec::new(),
+            |mut vars_to_delete, (directory, env_vars)| {
+                let mut working_dir = Some(current_dir.as_path());
+
+                while let Some(wdir) = working_dir {
+                    if &wdir == directory {
+                        return vars_to_delete;
+                    } else {
+                        working_dir = working_dir.unwrap().parent();
+                    }
+                }
+                //only delete vars from directories we are not in
+                vars_to_delete.extend(env_vars.clone());
+                vars_to_delete
+            },
+        );
+
+        Ok(vars_to_delete)
+    }
 }

crates/nu-cli/src/env/environment.rs

@@ -59,18 +59,33 @@ impl Environment {
     }
 
     pub fn maintain_directory_environment(&mut self) -> std::io::Result<()> {
+        self.direnv.env_vars_to_delete()?.iter().for_each(|k| {
+            self.remove_env(&k);
+        });
         self.direnv.env_vars_to_add()?.iter().for_each(|(k, v)| {
             self.add_env(&k, &v, true);
         });
 
-
-        self.direnv.overwritten_values_to_restore()?.iter().for_each(|(k, v)| {
-            self.add_env(&k, &v, true);
-        });
+        self.direnv
+            .overwritten_values_to_restore()?
+            .iter()
+            .for_each(|(k, v)| {
+                self.add_env(&k, &v, true);
+            });
 
         Ok(())
     }
 
+    fn remove_env(&mut self, key: &str) {
+        if let Some(Value {
+            value: UntaggedValue::Row(ref mut envs),
+            tag: _,
+        }) = self.environment_vars
+        {
+            envs.entries.remove(key);
+        };
+    }
+
     pub fn morph<T: Conf>(&mut self, configuration: &T) {
         self.environment_vars = configuration.env();
         self.path_vars = configuration.path();