Only add the std lib files once (#8830)

# Description

We were seeing duplicate entries for the std lib files, and this PR
addresses that. Each file should now only be added once.

Note: they are still parsed twice because it's hard to recover the
module from the output of `parse` but a bit of clever hacking in a
future PR might be able to do that.

# User-Facing Changes

_(List of all changes that impact the user experience here. This helps
us keep track of breaking changes.)_

# Tests + Formatting

Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A
clippy::needless_collect` to check that you're using the standard code
style
- `cargo test --workspace` to check that all tests pass
- `cargo run -- crates/nu-std/tests/run.nu` to run the tests for the
standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```

# After Submitting

If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
This commit is contained in:
JT
2023-04-10 08:55:47 +12:00
committed by GitHub
parent 4a955d7e76
commit 9e3d6c3bfd
7 changed files with 39 additions and 32 deletions

View File

@ -1719,9 +1719,8 @@ pub fn parse_use(working_set: &mut StateWorkingSet, spans: &[Span]) -> (Pipeline
};
if let Ok(contents) = std::fs::read(&module_path) {
let span_start = working_set.next_span_start();
working_set.add_file(module_filename, &contents);
let span_end = working_set.next_span_start();
let file_id = working_set.add_file(module_filename, &contents);
let new_span = working_set.get_span_for_file(file_id);
// Change the currently parsed directory
let prev_currently_parsed_cwd = if let Some(parent) = module_path.parent() {
@ -1738,11 +1737,8 @@ pub fn parse_use(working_set: &mut StateWorkingSet, spans: &[Span]) -> (Pipeline
working_set.parsed_module_files.push(module_path);
// Parse the module
let (block, module, module_comments) = parse_module_block(
working_set,
Span::new(span_start, span_end),
module_name.as_bytes(),
);
let (block, module, module_comments) =
parse_module_block(working_set, new_span, module_name.as_bytes());
// Remove the file from the stack of parsed module files
working_set.parsed_module_files.pop();
@ -2245,9 +2241,8 @@ pub fn parse_overlay_use(working_set: &mut StateWorkingSet, call: Box<Call>) ->
};
if let Ok(contents) = std::fs::read(&module_path) {
let span_start = working_set.next_span_start();
working_set.add_file(module_filename, &contents);
let span_end = working_set.next_span_start();
let file_id = working_set.add_file(module_filename, &contents);
let new_span = working_set.get_span_for_file(file_id);
// Change currently parsed directory
let prev_currently_parsed_cwd =
@ -2261,11 +2256,8 @@ pub fn parse_overlay_use(working_set: &mut StateWorkingSet, call: Box<Call>) ->
working_set.currently_parsed_cwd.clone()
};
let (block, module, module_comments) = parse_module_block(
working_set,
Span::new(span_start, span_end),
overlay_name.as_bytes(),
);
let (block, module, module_comments) =
parse_module_block(working_set, new_span, overlay_name.as_bytes());
// Restore the currently parsed directory back
working_set.currently_parsed_cwd = prev_currently_parsed_cwd;

View File

@ -5896,16 +5896,15 @@ pub fn parse(
contents: &[u8],
scoped: bool,
) -> Block {
let span_offset = working_set.next_span_start();
let name = match fname {
Some(fname) => fname.to_string(),
None => "source".to_string(),
};
working_set.add_file(name, contents);
let file_id = working_set.add_file(name, contents);
let new_span = working_set.get_span_for_file(file_id);
let (output, err) = lex(contents, span_offset, &[], &[], false);
let (output, err) = lex(contents, new_span.start, &[], &[], false);
if let Some(err) = err {
working_set.error(err)
}