extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-06-30 22:50:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Disallow hiding the same def twice; Add tests

Browse Source 
Tests got removed after rebase.
This commit is contained in:
Jakub Žádník
2021-10-02 00:12:30 +03:00
parent 891d79d2aa
commit fb0f83e574
2 changed files with 75 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
crates/nu-protocol/src/engine/engine_state.rs
View File

@ -337,8 +337,12 @@ impl<'a> StateWorkingSet<'a> {
}
pub fn hide_decl(&mut self, name: &[u8]) -> Option<DeclId> {
let mut hiding: HashSet<DeclId> = HashSet::new();
// Since we can mutate scope frames in delta, remove the id directly
for scope in self.delta.scope.iter_mut().rev() {
hiding.extend(&scope.hiding);
if let Some(decl_id) = scope.decls.remove(name) {
return Some(decl_id);
}
@ -352,9 +356,14 @@ impl<'a> StateWorkingSet<'a> {
.expect("internal error: missing required scope frame");
for scope in self.permanent_state.scope.iter().rev() {
hiding.extend(&scope.hiding);
if let Some(decl_id) = scope.decls.get(name) {
last_scope_frame.hiding.insert(*decl_id);
return Some(*decl_id);
if !hiding.contains(decl_id) {
// Do not hide already hidden decl
last_scope_frame.hiding.insert(*decl_id);
return Some(*decl_id);
}
}
}