mirror of
https://github.com/nushell/nushell.git
synced 2025-08-14 10:49:32 +02:00
add function to make env vars case-insensitive (#14390)
# Description This PR adds a new function that allows one to get an env var case-insensitively. I did this so we can hopefully stop having problems when Windows has HKLM as path and HKCU as Path. Instead of just changing every function that used the original one, I chose the ones that I thought were specific to getting the path. I didn't want to go all in and make every env get case insensitive, but maybe we should? 🤷🏻♂️ closes #12676 # User-Facing Changes <!-- List of all changes that impact the user experience here. This helps us keep track of breaking changes. --> # Tests + Formatting <!-- Don't forget to add tests that cover your changes. Make sure you've run and fixed any issues with these commands: - `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass (on Windows make sure to [enable developer mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging)) - `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the tests for the standard library > **Note** > from `nushell` you can also use the `toolkit` as follows > ```bash > use toolkit.nu # or use an `env_change` hook to activate it automatically > toolkit check pr > ``` --> # After Submitting <!-- If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date. -->
This commit is contained in:
@ -14,6 +14,7 @@ use crate::{
|
||||
use fancy_regex::Regex;
|
||||
use lru::LruCache;
|
||||
use nu_path::AbsolutePathBuf;
|
||||
use nu_utils::IgnoreCaseExt;
|
||||
use std::{
|
||||
collections::HashMap,
|
||||
num::NonZeroUsize,
|
||||
@ -465,20 +466,12 @@ impl EngineState {
|
||||
None
|
||||
}
|
||||
|
||||
// Get the path environment variable in a platform agnostic way
|
||||
pub fn get_path_env_var(&self) -> Option<&Value> {
|
||||
let env_path_name_windows: &str = "Path";
|
||||
let env_path_name_nix: &str = "PATH";
|
||||
|
||||
pub fn get_env_var_insensitive(&self, name: &str) -> Option<&Value> {
|
||||
for overlay_id in self.scope.active_overlays.iter().rev() {
|
||||
let overlay_name = String::from_utf8_lossy(self.get_overlay_name(*overlay_id));
|
||||
if let Some(env_vars) = self.env_vars.get(overlay_name.as_ref()) {
|
||||
if let Some(val) = env_vars.get(env_path_name_nix) {
|
||||
return Some(val);
|
||||
} else if let Some(val) = env_vars.get(env_path_name_windows) {
|
||||
return Some(val);
|
||||
} else {
|
||||
return None;
|
||||
if let Some(v) = env_vars.iter().find(|(k, _)| k.eq_ignore_case(name)) {
|
||||
return Some(v.1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -5,6 +5,7 @@ use crate::{
|
||||
},
|
||||
Config, IntoValue, OutDest, ShellError, Span, Value, VarId, ENV_VARIABLE_ID, NU_VARIABLE_ID,
|
||||
};
|
||||
use nu_utils::IgnoreCaseExt;
|
||||
use std::{
|
||||
collections::{HashMap, HashSet},
|
||||
fs::File,
|
||||
@ -494,6 +495,40 @@ impl Stack {
|
||||
None
|
||||
}
|
||||
|
||||
// Case-Insensitive version of get_env_var
|
||||
pub fn get_env_var_insensitive<'a>(
|
||||
&'a self,
|
||||
engine_state: &'a EngineState,
|
||||
name: &str,
|
||||
) -> Option<&'a Value> {
|
||||
for scope in self.env_vars.iter().rev() {
|
||||
for active_overlay in self.active_overlays.iter().rev() {
|
||||
if let Some(env_vars) = scope.get(active_overlay) {
|
||||
if let Some(v) = env_vars.iter().find(|(k, _)| k.eq_ignore_case(name)) {
|
||||
return Some(v.1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for active_overlay in self.active_overlays.iter().rev() {
|
||||
let is_hidden = if let Some(env_hidden) = self.env_hidden.get(active_overlay) {
|
||||
env_hidden.iter().any(|k| k.eq_ignore_case(name))
|
||||
} else {
|
||||
false
|
||||
};
|
||||
|
||||
if !is_hidden {
|
||||
if let Some(env_vars) = engine_state.env_vars.get(active_overlay) {
|
||||
if let Some(v) = env_vars.iter().find(|(k, _)| k.eq_ignore_case(name)) {
|
||||
return Some(v.1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
pub fn has_env_var(&self, engine_state: &EngineState, name: &str) -> bool {
|
||||
for scope in self.env_vars.iter().rev() {
|
||||
for active_overlay in self.active_overlays.iter().rev() {
|
||||
|
Reference in New Issue
Block a user