holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Require static path for source-env (#6526)

Browse Source
This commit is contained in:
Jakub Žádník
2022-09-08 23:41:49 +03:00
committed by GitHub
parent 1adebefc3e
commit e76b3d61de
4 changed files with 60 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
crates/nu-parser/src/parse_keywords.rs
View File

@ -2902,8 +2902,10 @@ pub fn parse_source(
let mut error = None;
let name = working_set.get_span_contents(spans[0]);
if name == b"source" {
if let Some(decl_id) = working_set.find_decl(b"source", &Type::Any) {
if name == b"source" || name == b"source-env" {
let scoped = name == b"source-env";
if let Some(decl_id) = working_set.find_decl(name, &Type::Any) {
let cwd = working_set.get_cwd();
// Is this the right call to be using here?
@ -2958,7 +2960,7 @@ pub fn parse_source(
working_set,
path.file_name().and_then(|x| x.to_str()),
&contents,
false,
scoped,
expand_aliases_denylist,
);
@ -2983,7 +2985,7 @@ pub fn parse_source(
let mut call_with_block = call;
// Adding this expression to the positional creates a syntax highlighting error
// FIXME: Adding this expression to the positional creates a syntax highlighting error
// after writing `source example.nu`
call_with_block.add_positional(Expression {
expr: Expr::Int(block_id as i64),

4
crates/nu-parser/src/parser.rs
View File

@ -4815,7 +4815,9 @@ pub fn parse_builtin_commands(
(pipeline, err)
}
b"overlay" => parse_overlay(working_set, &lite_command.parts, expand_aliases_denylist),
b"source" => parse_source(working_set, &lite_command.parts, expand_aliases_denylist),
b"source" | b"source-env" => {
parse_source(working_set, &lite_command.parts, expand_aliases_denylist)
}
b"export" => parse_export_in_block(working_set, lite_command, expand_aliases_denylist),
b"hide" => parse_hide(working_set, &lite_command.parts, expand_aliases_denylist),
#[cfg(feature = "plugin")]