extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-10 07:48:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove old alias implementation (#8797)

Browse Source
This commit is contained in:
Jakub Žádník
2023-04-07 21:09:38 +03:00
committed by GitHub
parent d881481758
commit 1b677f167e
39 changed files with 387 additions and 1818 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/nu-command/src/system/nu_check.rs
View File

@ -320,7 +320,7 @@ fn parse_module(
let new_span = Span::new(start, end);
let starting_error_count = working_set.parse_errors.len();
parse_module_block(working_set, new_span, filename.as_bytes(), &[]);
parse_module_block(working_set, new_span, filename.as_bytes());
if starting_error_count != working_set.parse_errors.len() {
if is_debug {
@ -354,7 +354,7 @@ fn parse_script(
span: Span,
) -> Result<PipelineData, ShellError> {
let starting_error_count = working_set.parse_errors.len();
parse(working_set, filename, contents, false, &[]);
parse(working_set, filename, contents, false);
if starting_error_count != working_set.parse_errors.len() {
let msg = format!(
r#"Found : {}"#,

26
crates/nu-command/src/system/which_.rs
View File

@ -1,4 +1,3 @@
use itertools::Itertools;
use log::trace;
use nu_engine::env;
use nu_engine::CallExt;
@ -74,27 +73,6 @@ fn entry(arg: impl Into<String>, path: impl Into<String>, builtin: bool, span: S
Value::Record { cols, vals, span }
}
fn get_entry_in_aliases(engine_state: &EngineState, name: &str, span: Span) -> Option<Value> {
if let Some(alias_id) = engine_state.find_alias(name.as_bytes(), &[]) {
let alias = engine_state.get_alias(alias_id);
let alias_str = alias
.iter()
.map(|alias_span| String::from_utf8_lossy(engine_state.get_span_contents(alias_span)))
.join(" ");
trace!("Found alias: {}", name);
Some(entry(
name,
format!("Nushell alias: {alias_str}"),
false,
span,
))
} else {
None
}
}
fn get_entry_in_commands(engine_state: &EngineState, name: &str, span: Span) -> Option<Value> {
if let Some(decl_id) = engine_state.find_decl(name.as_bytes(), &[]) {
let (msg, is_builtin) = if engine_state.get_decl(decl_id).is_custom_command() {
@ -119,10 +97,6 @@ fn get_entries_in_nu(
) -> Vec<Value> {
let mut all_entries = vec![];
if let Some(ent) = get_entry_in_aliases(engine_state, name, span) {
all_entries.push(ent);
}
if !all_entries.is_empty() && skip_after_first_found {
return all_entries;
}