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

fix block spans for the module keyword (#15078)

Browse Source 
# Description
I noticed that the following code snippet wasn't being highlighted
correctly. Spans used for parsing contents of the block was also
incorrectly used for the expression.

# User-Facing Changes
The block following the module keyword is now highlighted correctly.

| Before | After |
|--------|--------|
|
![image](https://github.com/user-attachments/assets/8d1040f5-5002-4880-bb71-47549a67a804)
|
![image](https://github.com/user-attachments/assets/0dc28e25-2da3-4411-82ae-3e4e129fd42f)
|

# Tests + Formatting

- 🟢 toolkit fmt
- 🟢 toolkit clippy
- 🟢 toolkit test
- 🟢 toolkit test stdlib

# After Submitting
N/A
This commit is contained in:
Bahex 2025-02-11 00:26:02 +03:00 committed by GitHub
parent c6fc6bd5a7
commit a2e335dcd7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2227,15 +2227,15 @@ pub fn parse_module(
let module_name = module_name_or_path; let module_name = module_name_or_path;
let block_span = spans[split_id + 1]; let block_expr_span = spans[split_id + 1];
let block_bytes = working_set.get_span_contents(block_span); let block_bytes = working_set.get_span_contents(block_expr_span);
let mut start = block_span.start; let mut start = block_expr_span.start;
let mut end = block_span.end; let mut end = block_expr_span.end;
if block_bytes.starts_with(b"{") { if block_bytes.starts_with(b"{") {
start += 1; start += 1;
} else { } else {
working_set.error(ParseError::Expected("block", block_span)); working_set.error(ParseError::Expected("block", block_expr_span));
return (garbage_pipeline(working_set, spans), None); return (garbage_pipeline(working_set, spans), None);
} }
@ -2245,17 +2245,22 @@ pub fn parse_module(
working_set.error(ParseError::Unclosed("}".into(), Span::new(end, end))); working_set.error(ParseError::Unclosed("}".into(), Span::new(end, end)));
} }
let block_span = Span::new(start, end); let block_content_span = Span::new(start, end);
let (block, module, inner_comments) = let (block, module, inner_comments) =
parse_module_block(working_set, block_span, module_name.as_bytes()); parse_module_block(working_set, block_content_span, module_name.as_bytes());
let block_id = working_set.add_block(Arc::new(block)); let block_id = working_set.add_block(Arc::new(block));
module_comments.extend(inner_comments); module_comments.extend(inner_comments);
let module_id = working_set.add_module(&module_name, module, module_comments); let module_id = working_set.add_module(&module_name, module, module_comments);
let block_expr = Expression::new(working_set, Expr::Block(block_id), block_span, Type::Any); let block_expr = Expression::new(
working_set,
Expr::Block(block_id),
block_expr_span,
Type::Any,
);
let module_decl_id = working_set let module_decl_id = working_set
.find_decl(b"module") .find_decl(b"module")