forked from extern/nushell
Add environment change hook (#5600)
* add environment change hook * clippy
This commit is contained in:
parent
2cc5952c37
commit
a3a9571dac
@ -12,7 +12,7 @@ use nu_engine::{convert_env_values, eval_block};
|
|||||||
use nu_parser::lex;
|
use nu_parser::lex;
|
||||||
use nu_protocol::{
|
use nu_protocol::{
|
||||||
engine::{EngineState, Stack, StateWorkingSet},
|
engine::{EngineState, Stack, StateWorkingSet},
|
||||||
BlockId, PipelineData, ShellError, Span, Value,
|
BlockId, PipelineData, PositionalArg, ShellError, Span, Value,
|
||||||
};
|
};
|
||||||
use reedline::{DefaultHinter, Emacs, Vi};
|
use reedline::{DefaultHinter, Emacs, Vi};
|
||||||
use std::io::{self, Write};
|
use std::io::{self, Write};
|
||||||
@ -201,12 +201,58 @@ pub fn evaluate_repl(
|
|||||||
// Right before we start our prompt and take input from the user,
|
// Right before we start our prompt and take input from the user,
|
||||||
// fire the "pre_prompt" hook
|
// fire the "pre_prompt" hook
|
||||||
if let Some(hook) = &config.hooks.pre_prompt {
|
if let Some(hook) = &config.hooks.pre_prompt {
|
||||||
if let Err(err) = run_hook(engine_state, stack, hook) {
|
if let Err(err) = run_hook(engine_state, stack, vec![], hook) {
|
||||||
let working_set = StateWorkingSet::new(engine_state);
|
let working_set = StateWorkingSet::new(engine_state);
|
||||||
report_error(&working_set, &err);
|
report_error(&working_set, &err);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Next, check all the environment variables they ask for
|
||||||
|
// fire the "env_change" hook
|
||||||
|
if let Some(hook) = config.hooks.env_change.clone() {
|
||||||
|
match hook {
|
||||||
|
Value::Record {
|
||||||
|
cols, vals: blocks, ..
|
||||||
|
} => {
|
||||||
|
for (idx, env_var) in cols.iter().enumerate() {
|
||||||
|
let before = engine_state
|
||||||
|
.previous_env_vars
|
||||||
|
.get(env_var)
|
||||||
|
.cloned()
|
||||||
|
.unwrap_or_default();
|
||||||
|
let after = stack.get_env_var(engine_state, env_var).unwrap_or_default();
|
||||||
|
if before != after {
|
||||||
|
if let Err(err) = run_hook(
|
||||||
|
engine_state,
|
||||||
|
stack,
|
||||||
|
vec![before, after.clone()],
|
||||||
|
&blocks[idx],
|
||||||
|
) {
|
||||||
|
let working_set = StateWorkingSet::new(engine_state);
|
||||||
|
report_error(&working_set, &err);
|
||||||
|
}
|
||||||
|
|
||||||
|
engine_state
|
||||||
|
.previous_env_vars
|
||||||
|
.insert(env_var.to_string(), after);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
x => {
|
||||||
|
let working_set = StateWorkingSet::new(engine_state);
|
||||||
|
report_error(
|
||||||
|
&working_set,
|
||||||
|
&ShellError::TypeMismatch(
|
||||||
|
"record for 'env_change' hook".to_string(),
|
||||||
|
x.span().unwrap_or_else(|_| Span::new(0, 0)),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
config = engine_state.get_config();
|
||||||
|
|
||||||
if config.shell_integration {
|
if config.shell_integration {
|
||||||
run_ansi_sequence(PRE_EXECUTE_MARKER)?;
|
run_ansi_sequence(PRE_EXECUTE_MARKER)?;
|
||||||
}
|
}
|
||||||
@ -232,7 +278,7 @@ pub fn evaluate_repl(
|
|||||||
// Right before we start running the code the user gave us,
|
// Right before we start running the code the user gave us,
|
||||||
// fire the "pre_execution" hook
|
// fire the "pre_execution" hook
|
||||||
if let Some(hook) = &config.hooks.pre_execution {
|
if let Some(hook) = &config.hooks.pre_execution {
|
||||||
if let Err(err) = run_hook(engine_state, stack, hook) {
|
if let Err(err) = run_hook(engine_state, stack, vec![], hook) {
|
||||||
let working_set = StateWorkingSet::new(engine_state);
|
let working_set = StateWorkingSet::new(engine_state);
|
||||||
report_error(&working_set, &err);
|
report_error(&working_set, &err);
|
||||||
}
|
}
|
||||||
@ -394,12 +440,13 @@ fn run_ansi_sequence(seq: &str) -> Result<(), ShellError> {
|
|||||||
pub fn run_hook(
|
pub fn run_hook(
|
||||||
engine_state: &EngineState,
|
engine_state: &EngineState,
|
||||||
stack: &mut Stack,
|
stack: &mut Stack,
|
||||||
|
arguments: Vec<Value>,
|
||||||
value: &Value,
|
value: &Value,
|
||||||
) -> Result<(), ShellError> {
|
) -> Result<(), ShellError> {
|
||||||
match value {
|
match value {
|
||||||
Value::List { vals, .. } => {
|
Value::List { vals, .. } => {
|
||||||
for val in vals {
|
for val in vals {
|
||||||
run_hook(engine_state, stack, val)?
|
run_hook(engine_state, stack, arguments.clone(), val)?
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
@ -407,7 +454,7 @@ pub fn run_hook(
|
|||||||
val: block_id,
|
val: block_id,
|
||||||
span,
|
span,
|
||||||
..
|
..
|
||||||
} => run_hook_block(engine_state, stack, *block_id, *span),
|
} => run_hook_block(engine_state, stack, *block_id, arguments, *span),
|
||||||
x => match x.span() {
|
x => match x.span() {
|
||||||
Ok(span) => Err(ShellError::MissingConfigValue(
|
Ok(span) => Err(ShellError::MissingConfigValue(
|
||||||
"block for hook in config".into(),
|
"block for hook in config".into(),
|
||||||
@ -425,12 +472,23 @@ pub fn run_hook_block(
|
|||||||
engine_state: &EngineState,
|
engine_state: &EngineState,
|
||||||
stack: &mut Stack,
|
stack: &mut Stack,
|
||||||
block_id: BlockId,
|
block_id: BlockId,
|
||||||
|
arguments: Vec<Value>,
|
||||||
span: Span,
|
span: Span,
|
||||||
) -> Result<(), ShellError> {
|
) -> Result<(), ShellError> {
|
||||||
let block = engine_state.get_block(block_id);
|
let block = engine_state.get_block(block_id);
|
||||||
let input = PipelineData::new(span);
|
let input = PipelineData::new(span);
|
||||||
|
|
||||||
match eval_block(engine_state, stack, block, input, false, false) {
|
let mut callee_stack = stack.gather_captures(&block.captures);
|
||||||
|
|
||||||
|
for (idx, PositionalArg { var_id, .. }) in
|
||||||
|
block.signature.required_positional.iter().enumerate()
|
||||||
|
{
|
||||||
|
if let Some(var_id) = var_id {
|
||||||
|
callee_stack.add_var(*var_id, arguments[idx].clone())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
match eval_block(engine_state, &mut callee_stack, block, input, false, false) {
|
||||||
Ok(pipeline_data) => match pipeline_data.into_value(span) {
|
Ok(pipeline_data) => match pipeline_data.into_value(span) {
|
||||||
Value::Error { error } => Err(error),
|
Value::Error { error } => Err(error),
|
||||||
_ => Ok(()),
|
_ => Ok(()),
|
||||||
|
@ -29,6 +29,7 @@ pub struct ParsedMenu {
|
|||||||
pub struct Hooks {
|
pub struct Hooks {
|
||||||
pub pre_prompt: Option<Value>,
|
pub pre_prompt: Option<Value>,
|
||||||
pub pre_execution: Option<Value>,
|
pub pre_execution: Option<Value>,
|
||||||
|
pub env_change: Option<Value>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Hooks {
|
impl Hooks {
|
||||||
@ -36,6 +37,7 @@ impl Hooks {
|
|||||||
Self {
|
Self {
|
||||||
pre_prompt: None,
|
pre_prompt: None,
|
||||||
pre_execution: None,
|
pre_execution: None,
|
||||||
|
env_change: None,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -384,9 +386,10 @@ fn create_hooks(value: &Value) -> Result<Hooks, ShellError> {
|
|||||||
match cols[idx].as_str() {
|
match cols[idx].as_str() {
|
||||||
"pre_prompt" => hooks.pre_prompt = Some(vals[idx].clone()),
|
"pre_prompt" => hooks.pre_prompt = Some(vals[idx].clone()),
|
||||||
"pre_execution" => hooks.pre_execution = Some(vals[idx].clone()),
|
"pre_execution" => hooks.pre_execution = Some(vals[idx].clone()),
|
||||||
|
"env_change" => hooks.env_change = Some(vals[idx].clone()),
|
||||||
x => {
|
x => {
|
||||||
return Err(ShellError::UnsupportedConfigValue(
|
return Err(ShellError::UnsupportedConfigValue(
|
||||||
"'pre_prompt' or 'pre_execution'".to_string(),
|
"'pre_prompt', 'pre_execution', or 'env_change'".to_string(),
|
||||||
x.to_string(),
|
x.to_string(),
|
||||||
*span,
|
*span,
|
||||||
));
|
));
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
use super::{Command, EnvVars, Stack};
|
use super::{Command, EnvVars, OverlayFrame, ScopeFrame, Stack, Visibility, DEFAULT_OVERLAY_NAME};
|
||||||
use crate::Value;
|
use crate::Value;
|
||||||
use crate::{
|
use crate::{
|
||||||
ast::Block, AliasId, BlockId, Config, DeclId, Example, Module, ModuleId, OverlayId, ShellError,
|
ast::Block, AliasId, BlockId, Config, DeclId, Example, Module, ModuleId, OverlayId, ShellError,
|
||||||
@ -16,266 +16,6 @@ use std::{
|
|||||||
};
|
};
|
||||||
|
|
||||||
static PWD_ENV: &str = "PWD";
|
static PWD_ENV: &str = "PWD";
|
||||||
pub static DEFAULT_OVERLAY_NAME: &str = "zero";
|
|
||||||
|
|
||||||
/// Tells whether a decl or alias is visible or not
|
|
||||||
#[derive(Debug, Clone)]
|
|
||||||
pub struct Visibility {
|
|
||||||
decl_ids: HashMap<DeclId, bool>,
|
|
||||||
alias_ids: HashMap<AliasId, bool>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Visibility {
|
|
||||||
pub fn new() -> Self {
|
|
||||||
Visibility {
|
|
||||||
decl_ids: HashMap::new(),
|
|
||||||
alias_ids: HashMap::new(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn is_decl_id_visible(&self, decl_id: &DeclId) -> bool {
|
|
||||||
*self.decl_ids.get(decl_id).unwrap_or(&true) // by default it's visible
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn is_alias_id_visible(&self, alias_id: &AliasId) -> bool {
|
|
||||||
*self.alias_ids.get(alias_id).unwrap_or(&true) // by default it's visible
|
|
||||||
}
|
|
||||||
|
|
||||||
fn hide_decl_id(&mut self, decl_id: &DeclId) {
|
|
||||||
self.decl_ids.insert(*decl_id, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
fn hide_alias_id(&mut self, alias_id: &AliasId) {
|
|
||||||
self.alias_ids.insert(*alias_id, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
fn use_decl_id(&mut self, decl_id: &DeclId) {
|
|
||||||
self.decl_ids.insert(*decl_id, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
fn use_alias_id(&mut self, alias_id: &AliasId) {
|
|
||||||
self.alias_ids.insert(*alias_id, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn merge_with(&mut self, other: Visibility) {
|
|
||||||
// overwrite own values with the other
|
|
||||||
self.decl_ids.extend(other.decl_ids);
|
|
||||||
self.alias_ids.extend(other.alias_ids);
|
|
||||||
}
|
|
||||||
|
|
||||||
fn append(&mut self, other: &Visibility) {
|
|
||||||
// take new values from the other but keep own values
|
|
||||||
for (decl_id, visible) in other.decl_ids.iter() {
|
|
||||||
if !self.decl_ids.contains_key(decl_id) {
|
|
||||||
self.decl_ids.insert(*decl_id, *visible);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for (alias_id, visible) in other.alias_ids.iter() {
|
|
||||||
if !self.alias_ids.contains_key(alias_id) {
|
|
||||||
self.alias_ids.insert(*alias_id, *visible);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
|
||||||
pub struct ScopeFrame {
|
|
||||||
/// List of both active and incactive overlays in this ScopeFrame.
|
|
||||||
///
|
|
||||||
/// The order does not have any menaning. Indexed locally (within this ScopeFrame) by
|
|
||||||
/// OverlayIds in active_overlays.
|
|
||||||
overlays: Vec<(Vec<u8>, OverlayFrame)>,
|
|
||||||
|
|
||||||
/// List of currently active overlays.
|
|
||||||
///
|
|
||||||
/// Order is significant: The last item points at the last activated overlay.
|
|
||||||
pub active_overlays: Vec<OverlayId>,
|
|
||||||
|
|
||||||
/// Deactivated overlays from permanent state.
|
|
||||||
/// ! Stores OverlayIds from the permanent state, not from this frame. !
|
|
||||||
// removed_overlays: Vec<OverlayId>,
|
|
||||||
|
|
||||||
/// Removed overlays from previous scope frames / permanent state
|
|
||||||
removed_overlays: Vec<Vec<u8>>,
|
|
||||||
|
|
||||||
/// temporary storage for predeclarations
|
|
||||||
predecls: HashMap<Vec<u8>, DeclId>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl ScopeFrame {
|
|
||||||
pub fn new() -> Self {
|
|
||||||
Self {
|
|
||||||
overlays: vec![],
|
|
||||||
active_overlays: vec![],
|
|
||||||
removed_overlays: vec![],
|
|
||||||
predecls: HashMap::new(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn with_empty_overlay(name: Vec<u8>, origin: ModuleId) -> Self {
|
|
||||||
Self {
|
|
||||||
overlays: vec![(name, OverlayFrame::from(origin))],
|
|
||||||
active_overlays: vec![0],
|
|
||||||
removed_overlays: vec![],
|
|
||||||
predecls: HashMap::new(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn get_var(&self, var_name: &[u8]) -> Option<&VarId> {
|
|
||||||
for overlay_id in self.active_overlays.iter().rev() {
|
|
||||||
if let Some(var_id) = self
|
|
||||||
.overlays
|
|
||||||
.get(*overlay_id)
|
|
||||||
.expect("internal error: missing overlay")
|
|
||||||
.1
|
|
||||||
.vars
|
|
||||||
.get(var_name)
|
|
||||||
{
|
|
||||||
return Some(var_id);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
None
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn active_overlay_ids(&self, removed_overlays: &mut Vec<Vec<u8>>) -> Vec<OverlayId> {
|
|
||||||
for name in &self.removed_overlays {
|
|
||||||
if !removed_overlays.contains(name) {
|
|
||||||
removed_overlays.push(name.clone());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
self.active_overlays
|
|
||||||
.iter()
|
|
||||||
.filter(|id| !removed_overlays.contains(self.get_overlay_name(**id)))
|
|
||||||
.copied()
|
|
||||||
.collect()
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn active_overlays(&self, removed_overlays: &mut Vec<Vec<u8>>) -> Vec<&OverlayFrame> {
|
|
||||||
self.active_overlay_ids(removed_overlays)
|
|
||||||
.iter()
|
|
||||||
.map(|id| self.get_overlay(*id))
|
|
||||||
.collect()
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn active_overlay_names(&self, removed_overlays: &mut Vec<Vec<u8>>) -> Vec<&Vec<u8>> {
|
|
||||||
self.active_overlay_ids(removed_overlays)
|
|
||||||
.iter()
|
|
||||||
.map(|id| self.get_overlay_name(*id))
|
|
||||||
.collect()
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn get_overlay_name(&self, overlay_id: OverlayId) -> &Vec<u8> {
|
|
||||||
&self
|
|
||||||
.overlays
|
|
||||||
.get(overlay_id)
|
|
||||||
.expect("internal error: missing overlay")
|
|
||||||
.0
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn get_overlay(&self, overlay_id: OverlayId) -> &OverlayFrame {
|
|
||||||
&self
|
|
||||||
.overlays
|
|
||||||
.get(overlay_id)
|
|
||||||
.expect("internal error: missing overlay")
|
|
||||||
.1
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn get_overlay_mut(&mut self, overlay_id: OverlayId) -> &mut OverlayFrame {
|
|
||||||
&mut self
|
|
||||||
.overlays
|
|
||||||
.get_mut(overlay_id)
|
|
||||||
.expect("internal error: missing overlay")
|
|
||||||
.1
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn find_overlay(&self, name: &[u8]) -> Option<OverlayId> {
|
|
||||||
self.overlays.iter().position(|(n, _)| n == name)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn find_active_overlay(&self, name: &[u8]) -> Option<OverlayId> {
|
|
||||||
self.overlays
|
|
||||||
.iter()
|
|
||||||
.position(|(n, _)| n == name)
|
|
||||||
.and_then(|id| {
|
|
||||||
if self.active_overlays.contains(&id) {
|
|
||||||
Some(id)
|
|
||||||
} else {
|
|
||||||
None
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// type OverlayDiff = (Vec<(Vec<u8>, DeclId)>, Vec<(Vec<u8>, AliasId)>);
|
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
|
||||||
pub struct OverlayFrame {
|
|
||||||
pub vars: HashMap<Vec<u8>, VarId>,
|
|
||||||
predecls: HashMap<Vec<u8>, DeclId>, // temporary storage for predeclarations
|
|
||||||
pub decls: HashMap<Vec<u8>, DeclId>,
|
|
||||||
pub aliases: HashMap<Vec<u8>, AliasId>,
|
|
||||||
pub modules: HashMap<Vec<u8>, ModuleId>,
|
|
||||||
pub visibility: Visibility,
|
|
||||||
pub origin: ModuleId, // The original module the overlay was created from
|
|
||||||
}
|
|
||||||
|
|
||||||
impl OverlayFrame {
|
|
||||||
pub fn from(origin: ModuleId) -> Self {
|
|
||||||
Self {
|
|
||||||
vars: HashMap::new(),
|
|
||||||
predecls: HashMap::new(),
|
|
||||||
decls: HashMap::new(),
|
|
||||||
aliases: HashMap::new(),
|
|
||||||
modules: HashMap::new(),
|
|
||||||
visibility: Visibility::new(),
|
|
||||||
origin,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Find out which definitions are custom compared to the origin module
|
|
||||||
// pub fn diff(&self, engine_state: &EngineState) -> OverlayDiff {
|
|
||||||
// let module = engine_state.get_module(self.origin);
|
|
||||||
|
|
||||||
// let decls = self
|
|
||||||
// .decls
|
|
||||||
// .iter()
|
|
||||||
// .filter(|(name, decl_id)| {
|
|
||||||
// if self.visibility.is_decl_id_visible(decl_id) {
|
|
||||||
// if let Some(original_id) = module.get_decl_id(name) {
|
|
||||||
// &original_id != *decl_id
|
|
||||||
// } else {
|
|
||||||
// true
|
|
||||||
// }
|
|
||||||
// } else {
|
|
||||||
// false
|
|
||||||
// }
|
|
||||||
// })
|
|
||||||
// .map(|(name, decl_id)| (name.to_owned(), *decl_id))
|
|
||||||
// .collect();
|
|
||||||
|
|
||||||
// let aliases = self
|
|
||||||
// .aliases
|
|
||||||
// .iter()
|
|
||||||
// .filter(|(name, alias_id)| {
|
|
||||||
// if self.visibility.is_alias_id_visible(alias_id) {
|
|
||||||
// if let Some(original_id) = module.get_alias_id(name) {
|
|
||||||
// &original_id != *alias_id
|
|
||||||
// } else {
|
|
||||||
// true
|
|
||||||
// }
|
|
||||||
// } else {
|
|
||||||
// false
|
|
||||||
// }
|
|
||||||
// })
|
|
||||||
// .map(|(name, alias_id)| (name.to_owned(), *alias_id))
|
|
||||||
// .collect();
|
|
||||||
|
|
||||||
// (decls, aliases)
|
|
||||||
// }
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The core global engine state. This includes all global definitions as well as any global state that
|
/// The core global engine state. This includes all global definitions as well as any global state that
|
||||||
/// will persist for the whole session.
|
/// will persist for the whole session.
|
||||||
@ -331,6 +71,7 @@ pub struct EngineState {
|
|||||||
pub scope: ScopeFrame,
|
pub scope: ScopeFrame,
|
||||||
pub ctrlc: Option<Arc<AtomicBool>>,
|
pub ctrlc: Option<Arc<AtomicBool>>,
|
||||||
pub env_vars: EnvVars,
|
pub env_vars: EnvVars,
|
||||||
|
pub previous_env_vars: HashMap<String, Value>,
|
||||||
pub config: Config,
|
pub config: Config,
|
||||||
#[cfg(feature = "plugin")]
|
#[cfg(feature = "plugin")]
|
||||||
pub plugin_signatures: Option<PathBuf>,
|
pub plugin_signatures: Option<PathBuf>,
|
||||||
@ -361,6 +102,7 @@ impl EngineState {
|
|||||||
scope: ScopeFrame::with_empty_overlay(DEFAULT_OVERLAY_NAME.as_bytes().to_vec(), 0),
|
scope: ScopeFrame::with_empty_overlay(DEFAULT_OVERLAY_NAME.as_bytes().to_vec(), 0),
|
||||||
ctrlc: None,
|
ctrlc: None,
|
||||||
env_vars: EnvVars::from([(DEFAULT_OVERLAY_NAME.to_string(), HashMap::new())]),
|
env_vars: EnvVars::from([(DEFAULT_OVERLAY_NAME.to_string(), HashMap::new())]),
|
||||||
|
previous_env_vars: HashMap::new(),
|
||||||
config: Config::default(),
|
config: Config::default(),
|
||||||
#[cfg(feature = "plugin")]
|
#[cfg(feature = "plugin")]
|
||||||
plugin_signatures: None,
|
plugin_signatures: None,
|
||||||
|
@ -2,10 +2,12 @@ mod call_info;
|
|||||||
mod capture_block;
|
mod capture_block;
|
||||||
mod command;
|
mod command;
|
||||||
mod engine_state;
|
mod engine_state;
|
||||||
|
mod overlay;
|
||||||
mod stack;
|
mod stack;
|
||||||
|
|
||||||
pub use call_info::*;
|
pub use call_info::*;
|
||||||
pub use capture_block::*;
|
pub use capture_block::*;
|
||||||
pub use command::*;
|
pub use command::*;
|
||||||
pub use engine_state::*;
|
pub use engine_state::*;
|
||||||
|
pub use overlay::*;
|
||||||
pub use stack::*;
|
pub use stack::*;
|
||||||
|
264
crates/nu-protocol/src/engine/overlay.rs
Normal file
264
crates/nu-protocol/src/engine/overlay.rs
Normal file
@ -0,0 +1,264 @@
|
|||||||
|
use std::collections::HashMap;
|
||||||
|
|
||||||
|
use crate::{AliasId, DeclId, ModuleId, OverlayId, VarId};
|
||||||
|
|
||||||
|
pub static DEFAULT_OVERLAY_NAME: &str = "zero";
|
||||||
|
|
||||||
|
/// Tells whether a decl or alias is visible or not
|
||||||
|
#[derive(Debug, Clone)]
|
||||||
|
pub struct Visibility {
|
||||||
|
decl_ids: HashMap<DeclId, bool>,
|
||||||
|
alias_ids: HashMap<AliasId, bool>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Visibility {
|
||||||
|
pub fn new() -> Self {
|
||||||
|
Visibility {
|
||||||
|
decl_ids: HashMap::new(),
|
||||||
|
alias_ids: HashMap::new(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn is_decl_id_visible(&self, decl_id: &DeclId) -> bool {
|
||||||
|
*self.decl_ids.get(decl_id).unwrap_or(&true) // by default it's visible
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn is_alias_id_visible(&self, alias_id: &AliasId) -> bool {
|
||||||
|
*self.alias_ids.get(alias_id).unwrap_or(&true) // by default it's visible
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn hide_decl_id(&mut self, decl_id: &DeclId) {
|
||||||
|
self.decl_ids.insert(*decl_id, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn hide_alias_id(&mut self, alias_id: &AliasId) {
|
||||||
|
self.alias_ids.insert(*alias_id, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn use_decl_id(&mut self, decl_id: &DeclId) {
|
||||||
|
self.decl_ids.insert(*decl_id, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn use_alias_id(&mut self, alias_id: &AliasId) {
|
||||||
|
self.alias_ids.insert(*alias_id, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn merge_with(&mut self, other: Visibility) {
|
||||||
|
// overwrite own values with the other
|
||||||
|
self.decl_ids.extend(other.decl_ids);
|
||||||
|
self.alias_ids.extend(other.alias_ids);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn append(&mut self, other: &Visibility) {
|
||||||
|
// take new values from the other but keep own values
|
||||||
|
for (decl_id, visible) in other.decl_ids.iter() {
|
||||||
|
if !self.decl_ids.contains_key(decl_id) {
|
||||||
|
self.decl_ids.insert(*decl_id, *visible);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for (alias_id, visible) in other.alias_ids.iter() {
|
||||||
|
if !self.alias_ids.contains_key(alias_id) {
|
||||||
|
self.alias_ids.insert(*alias_id, *visible);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone)]
|
||||||
|
pub struct ScopeFrame {
|
||||||
|
/// List of both active and incactive overlays in this ScopeFrame.
|
||||||
|
///
|
||||||
|
/// The order does not have any menaning. Indexed locally (within this ScopeFrame) by
|
||||||
|
/// OverlayIds in active_overlays.
|
||||||
|
pub overlays: Vec<(Vec<u8>, OverlayFrame)>,
|
||||||
|
|
||||||
|
/// List of currently active overlays.
|
||||||
|
///
|
||||||
|
/// Order is significant: The last item points at the last activated overlay.
|
||||||
|
pub active_overlays: Vec<OverlayId>,
|
||||||
|
|
||||||
|
/// Deactivated overlays from permanent state.
|
||||||
|
/// ! Stores OverlayIds from the permanent state, not from this frame. !
|
||||||
|
// removed_overlays: Vec<OverlayId>,
|
||||||
|
|
||||||
|
/// Removed overlays from previous scope frames / permanent state
|
||||||
|
pub removed_overlays: Vec<Vec<u8>>,
|
||||||
|
|
||||||
|
/// temporary storage for predeclarations
|
||||||
|
pub predecls: HashMap<Vec<u8>, DeclId>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ScopeFrame {
|
||||||
|
pub fn new() -> Self {
|
||||||
|
Self {
|
||||||
|
overlays: vec![],
|
||||||
|
active_overlays: vec![],
|
||||||
|
removed_overlays: vec![],
|
||||||
|
predecls: HashMap::new(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn with_empty_overlay(name: Vec<u8>, origin: ModuleId) -> Self {
|
||||||
|
Self {
|
||||||
|
overlays: vec![(name, OverlayFrame::from(origin))],
|
||||||
|
active_overlays: vec![0],
|
||||||
|
removed_overlays: vec![],
|
||||||
|
predecls: HashMap::new(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_var(&self, var_name: &[u8]) -> Option<&VarId> {
|
||||||
|
for overlay_id in self.active_overlays.iter().rev() {
|
||||||
|
if let Some(var_id) = self
|
||||||
|
.overlays
|
||||||
|
.get(*overlay_id)
|
||||||
|
.expect("internal error: missing overlay")
|
||||||
|
.1
|
||||||
|
.vars
|
||||||
|
.get(var_name)
|
||||||
|
{
|
||||||
|
return Some(var_id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn active_overlay_ids(&self, removed_overlays: &mut Vec<Vec<u8>>) -> Vec<OverlayId> {
|
||||||
|
for name in &self.removed_overlays {
|
||||||
|
if !removed_overlays.contains(name) {
|
||||||
|
removed_overlays.push(name.clone());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
self.active_overlays
|
||||||
|
.iter()
|
||||||
|
.filter(|id| !removed_overlays.contains(self.get_overlay_name(**id)))
|
||||||
|
.copied()
|
||||||
|
.collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn active_overlays(&self, removed_overlays: &mut Vec<Vec<u8>>) -> Vec<&OverlayFrame> {
|
||||||
|
self.active_overlay_ids(removed_overlays)
|
||||||
|
.iter()
|
||||||
|
.map(|id| self.get_overlay(*id))
|
||||||
|
.collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn active_overlay_names(&self, removed_overlays: &mut Vec<Vec<u8>>) -> Vec<&Vec<u8>> {
|
||||||
|
self.active_overlay_ids(removed_overlays)
|
||||||
|
.iter()
|
||||||
|
.map(|id| self.get_overlay_name(*id))
|
||||||
|
.collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_overlay_name(&self, overlay_id: OverlayId) -> &Vec<u8> {
|
||||||
|
&self
|
||||||
|
.overlays
|
||||||
|
.get(overlay_id)
|
||||||
|
.expect("internal error: missing overlay")
|
||||||
|
.0
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_overlay(&self, overlay_id: OverlayId) -> &OverlayFrame {
|
||||||
|
&self
|
||||||
|
.overlays
|
||||||
|
.get(overlay_id)
|
||||||
|
.expect("internal error: missing overlay")
|
||||||
|
.1
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_overlay_mut(&mut self, overlay_id: OverlayId) -> &mut OverlayFrame {
|
||||||
|
&mut self
|
||||||
|
.overlays
|
||||||
|
.get_mut(overlay_id)
|
||||||
|
.expect("internal error: missing overlay")
|
||||||
|
.1
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn find_overlay(&self, name: &[u8]) -> Option<OverlayId> {
|
||||||
|
self.overlays.iter().position(|(n, _)| n == name)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn find_active_overlay(&self, name: &[u8]) -> Option<OverlayId> {
|
||||||
|
self.overlays
|
||||||
|
.iter()
|
||||||
|
.position(|(n, _)| n == name)
|
||||||
|
.and_then(|id| {
|
||||||
|
if self.active_overlays.contains(&id) {
|
||||||
|
Some(id)
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// type OverlayDiff = (Vec<(Vec<u8>, DeclId)>, Vec<(Vec<u8>, AliasId)>);
|
||||||
|
|
||||||
|
#[derive(Debug, Clone)]
|
||||||
|
pub struct OverlayFrame {
|
||||||
|
pub vars: HashMap<Vec<u8>, VarId>,
|
||||||
|
pub predecls: HashMap<Vec<u8>, DeclId>, // temporary storage for predeclarations
|
||||||
|
pub decls: HashMap<Vec<u8>, DeclId>,
|
||||||
|
pub aliases: HashMap<Vec<u8>, AliasId>,
|
||||||
|
pub modules: HashMap<Vec<u8>, ModuleId>,
|
||||||
|
pub visibility: Visibility,
|
||||||
|
pub origin: ModuleId, // The original module the overlay was created from
|
||||||
|
}
|
||||||
|
|
||||||
|
impl OverlayFrame {
|
||||||
|
pub fn from(origin: ModuleId) -> Self {
|
||||||
|
Self {
|
||||||
|
vars: HashMap::new(),
|
||||||
|
predecls: HashMap::new(),
|
||||||
|
decls: HashMap::new(),
|
||||||
|
aliases: HashMap::new(),
|
||||||
|
modules: HashMap::new(),
|
||||||
|
visibility: Visibility::new(),
|
||||||
|
origin,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Find out which definitions are custom compared to the origin module
|
||||||
|
// pub fn diff(&self, engine_state: &EngineState) -> OverlayDiff {
|
||||||
|
// let module = engine_state.get_module(self.origin);
|
||||||
|
|
||||||
|
// let decls = self
|
||||||
|
// .decls
|
||||||
|
// .iter()
|
||||||
|
// .filter(|(name, decl_id)| {
|
||||||
|
// if self.visibility.is_decl_id_visible(decl_id) {
|
||||||
|
// if let Some(original_id) = module.get_decl_id(name) {
|
||||||
|
// &original_id != *decl_id
|
||||||
|
// } else {
|
||||||
|
// true
|
||||||
|
// }
|
||||||
|
// } else {
|
||||||
|
// false
|
||||||
|
// }
|
||||||
|
// })
|
||||||
|
// .map(|(name, decl_id)| (name.to_owned(), *decl_id))
|
||||||
|
// .collect();
|
||||||
|
|
||||||
|
// let aliases = self
|
||||||
|
// .aliases
|
||||||
|
// .iter()
|
||||||
|
// .filter(|(name, alias_id)| {
|
||||||
|
// if self.visibility.is_alias_id_visible(alias_id) {
|
||||||
|
// if let Some(original_id) = module.get_alias_id(name) {
|
||||||
|
// &original_id != *alias_id
|
||||||
|
// } else {
|
||||||
|
// true
|
||||||
|
// }
|
||||||
|
// } else {
|
||||||
|
// false
|
||||||
|
// }
|
||||||
|
// })
|
||||||
|
// .map(|(name, alias_id)| (name.to_owned(), *alias_id))
|
||||||
|
// .collect();
|
||||||
|
|
||||||
|
// (decls, aliases)
|
||||||
|
// }
|
||||||
|
}
|
@ -1,6 +1,7 @@
|
|||||||
use std::collections::{HashMap, HashSet};
|
use std::collections::{HashMap, HashSet};
|
||||||
|
|
||||||
use crate::engine::{EngineState, DEFAULT_OVERLAY_NAME};
|
use crate::engine::EngineState;
|
||||||
|
use crate::engine::DEFAULT_OVERLAY_NAME;
|
||||||
use crate::{ShellError, Span, Value, VarId};
|
use crate::{ShellError, Span, Value, VarId};
|
||||||
|
|
||||||
/// Environment variables per overlay
|
/// Environment variables per overlay
|
||||||
|
@ -206,6 +206,11 @@ let-env config = {
|
|||||||
pre_execution: [{
|
pre_execution: [{
|
||||||
$nothing # replace with source code to run before the repl input is run
|
$nothing # replace with source code to run before the repl input is run
|
||||||
}]
|
}]
|
||||||
|
env_change: {
|
||||||
|
PWD: [{|before, after|
|
||||||
|
$nothing # replace with source code to run if the PWD environment is different since the last repl input
|
||||||
|
}]
|
||||||
|
}
|
||||||
}
|
}
|
||||||
menus: [
|
menus: [
|
||||||
# Configuration for default nushell menus
|
# Configuration for default nushell menus
|
||||||
|
Loading…
Reference in New Issue
Block a user