fix error when exporting consts with type signatures in modules (#14118)

Fixes #14023

# Description

- Prevents "failed to find added variable" when modules export constants
  with type signatures:

```nushell
> module foo { export const bar: int = 2 }
Error: nu::parser::unknown_state

  × Internal error.
   ╭─[entry #1:1:21]
 1 │ module foo { export const bar: int = 2 }
   ·                     ─────────┬────────
   ·                              ╰── failed to find added variable
```

- Returns `name_is_builtin_var` errors for names with type signatures:

```nushell
> let env: string = "";
Error: nu::parser::name_is_builtin_var

  × `env` used as variable name.
   ╭─[entry #1:1:5]
 1 │ let env: string = "";
   ·     ─┬─
   ·      ╰── already a builtin variable
```
This commit is contained in:
Solomon
2024-10-22 09:54:31 +00:00
committed by GitHub
parent ee97c00818
commit 4968b6b9d0
5 changed files with 53 additions and 43 deletions

View File

@ -3113,7 +3113,8 @@ pub fn parse_var_with_opt_type(
spans_idx: &mut usize,
mutable: bool,
) -> (Expression, Option<Type>) {
let bytes = working_set.get_span_contents(spans[*spans_idx]).to_vec();
let name_span = spans[*spans_idx];
let bytes = working_set.get_span_contents(name_span).to_vec();
if bytes.contains(&b' ')
|| bytes.contains(&b'"')
@ -3125,9 +3126,11 @@ pub fn parse_var_with_opt_type(
}
if bytes.ends_with(b":") {
let name_span = Span::new(name_span.start, name_span.end - 1);
let var_name = bytes[0..(bytes.len() - 1)].to_vec();
// We end with colon, so the next span should be the type
if *spans_idx + 1 < spans.len() {
let span_beginning = *spans_idx;
*spans_idx += 1;
// signature like record<a: int b: int> is broken into multiple spans due to
// whitespaces. Collect the rest into one span and work on it
@ -3144,8 +3147,6 @@ pub fn parse_var_with_opt_type(
let ty = parse_type(working_set, &type_bytes, tokens[0].span);
*spans_idx = spans.len() - 1;
let var_name = bytes[0..(bytes.len() - 1)].to_vec();
if !is_variable(&var_name) {
working_set.error(ParseError::Expected(
"valid variable name",
@ -3157,17 +3158,10 @@ pub fn parse_var_with_opt_type(
let id = working_set.add_variable(var_name, spans[*spans_idx - 1], ty.clone(), mutable);
(
Expression::new(
working_set,
Expr::VarDecl(id),
Span::concat(&spans[span_beginning..*spans_idx + 1]),
ty.clone(),
),
Expression::new(working_set, Expr::VarDecl(id), name_span, ty.clone()),
Some(ty),
)
} else {
let var_name = bytes[0..(bytes.len() - 1)].to_vec();
if !is_variable(&var_name) {
working_set.error(ParseError::Expected(
"valid variable name",
@ -5615,7 +5609,7 @@ pub fn parse_builtin_commands(
.parts_including_redirection()
.collect::<Vec<Span>>(),
),
b"const" => parse_const(working_set, &lite_command.parts),
b"const" => parse_const(working_set, &lite_command.parts).0,
b"mut" => parse_mut(
working_set,
&lite_command