Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2024-12-27 21:43:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

sort scope.aliases, commands, variables (#3319)

Browse source
This commit is contained in:
Darren Schroeder 2021-04-14 18:57:47 -05:00 committed by GitHub
parent e8bc319f08
commit fd7875e572
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
crates/nu-engine/src/evaluate/scope.rs
View file

@ -34,7 +34,7 @@ impl Scope {
} }
pub fn get_aliases(&self) -> IndexMap<String, Vec<Spanned<String>>> { pub fn get_aliases(&self) -> IndexMap<String, Vec<Spanned<String>>> {
let mut output = IndexMap::new(); let mut output: IndexMap<String, Vec<Spanned<String>>> = IndexMap::new();
for frame in self.frames.lock().iter().rev() { for frame in self.frames.lock().iter().rev() {
for v in frame.aliases.iter() { for v in frame.aliases.iter() {
@ -43,11 +43,12 @@ impl Scope {
} }
} }
} }
output
output.sorted_by(|k1, _v1, k2, _v2| k1.cmp(k2)).collect()
} }
pub fn get_commands(&self) -> IndexMap<String, Signature> { pub fn get_commands(&self) -> IndexMap<String, Signature> {
let mut output = IndexMap::new(); let mut output: IndexMap<String, Signature> = IndexMap::new();
for frame in self.frames.lock().iter().rev() { for frame in self.frames.lock().iter().rev() {
for (name, command) in frame.commands.iter() { for (name, command) in frame.commands.iter() {
@ -60,7 +61,22 @@ impl Scope {
} }
} }
output output.sorted_by(|k1, _v1, k2, _v2| k1.cmp(k2)).collect()
}
pub fn get_vars(&self) -> IndexMap<String, Value> {
//FIXME: should this be an iterator?
let mut output: IndexMap<String, Value> = IndexMap::new();
for frame in self.frames.lock().iter().rev() {
for v in frame.vars.iter() {
if !output.contains_key(v.0) {
output.insert(v.0.clone(), v.1.clone());
}
}
}
output.sorted_by(|k1, _v1, k2, _v2| k1.cmp(k2)).collect()
} }
pub fn get_aliases_with_name(&self, name: &str) -> Option<Vec<Vec<Spanned<String>>>> { pub fn get_aliases_with_name(&self, name: &str) -> Option<Vec<Vec<Spanned<String>>>> {
@ -109,8 +125,9 @@ impl Scope {
names.append(&mut frame_command_names); names.append(&mut frame_command_names);
} }
names.dedup(); // Sort needs to happen first because dedup works on consecutive dupes only
names.sort(); names.sort();
names.dedup();
names names
} }
@ -125,6 +142,7 @@ impl Scope {
names.append(&mut frame_command_names); names.append(&mut frame_command_names);
} }
// Sort needs to happen first because dedup works on consecutive dupes only
names.sort(); names.sort();
names.dedup(); names.dedup();
@ -166,21 +184,6 @@ impl Scope {
} }
} }
pub fn get_vars(&self) -> IndexMap<String, Value> {
//FIXME: should this be an iterator?
let mut output = IndexMap::new();
for frame in self.frames.lock().iter().rev() {
for v in frame.vars.iter() {
if !output.contains_key(v.0) {
output.insert(v.0.clone(), v.1.clone());
}
}
}
output
}
pub fn get_env_vars(&self) -> IndexMap<String, String> { pub fn get_env_vars(&self) -> IndexMap<String, String> {
//FIXME: should this be an iterator? //FIXME: should this be an iterator?
let mut output = IndexMap::new(); let mut output = IndexMap::new();