extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-16 05:57:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

source: make sure the block is compiled when parsing (#15798)

Browse Source 
# Description
Fixes: https://github.com/nushell/nushell/issues/15749

When sourcing a file, the ir block might be empty because it has been
used before, this pr is going to make sure that the ir block is
compiled.

# User-Facing Changes
```
touch aaa.nu
use aaa.nu
source aaa.nu
```
Will no longer raise an error.

# Tests + Formatting
Added 1 test

# After Submitting
NaN
This commit is contained in:
Wind
2025-05-24 03:30:21 +08:00
committed by GitHub
parent c10e483683
commit 60cb13c493
3 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
use crate::{
exportable::Exportable,
parse_block,
parser::{parse_attribute, parse_redirection, redirecting_builtin_error},
parser::{compile_block, parse_attribute, parse_redirection, redirecting_builtin_error},
type_check::{check_block_input_output, type_compatible},
};
use itertools::Itertools;
@ -3805,12 +3805,16 @@ pub fn parse_source(working_set: &mut StateWorkingSet, lite_command: &LiteComman
// This will load the defs from the file into the
// working set, if it was a successful parse.
let block = parse(
let mut block = parse(
working_set,
Some(&path.path().to_string_lossy()),
&contents,
scoped,
);
if block.ir_block.is_none() {
let block_mut = Arc::make_mut(&mut block);
compile_block(working_set, block_mut);
}
// Remove the file from the stack of files being processed.
working_set.files.pop();

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

@ -6496,7 +6496,7 @@ pub fn parse_block(
}
/// Compile an IR block for the `Block`, adding a compile error on failure
fn compile_block(working_set: &mut StateWorkingSet<'_>, block: &mut Block) {
pub fn compile_block(working_set: &mut StateWorkingSet<'_>, block: &mut Block) {
match nu_engine::compile(working_set, block) {
Ok(ir_block) => {
block.ir_block = Some(ir_block);