Skip to content

Allow blocks in interpolated string expressions #3503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HABER7789 merged 3 commits into from
Jul 23, 2026
Merged

Allow blocks in interpolated string expressions #3503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2e48f6
allow blocks in interpolated string expressions
HABER7789 Jul 22, 2026
5e9fe30
allowed too_many_lines for snapshot tests
HABER7789 Jul 22, 2026
5e1ae20
add tests for blocks in interpolated string expressions
HABER7789 Jul 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions source/compiler/qsc_eval/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3357,6 +3357,34 @@ fn nested_interpolated_string_with_exprs() {
);
}

#[test]
fn interpolated_string_block() {
check_expr("", r#"$"{ { 2 + 3 } }""#, &expect!["5"]);
}

#[test]
fn interpolated_string_for_loop() {
check_expr("", r#"$"{for _ in 1..3 {}}""#, &expect!["()"]);
}

#[test]
fn interpolated_string_block_with_loop() {
check_expr(
"",
r#"$"result is { { mutable r = 0; for _ in 1..3 { set r += 1; } r } }""#,
&expect!["result is 3"],
);
}

#[test]
fn nested_interpolated_string_with_block() {
check_expr(
"",
r#"$"A={ { let b = $"B={ {2 + 3} }"; b } }""#,
&expect!["A=B=5"],
);
}

#[test]
fn udt_unwrap() {
check_expr(
Expand Down
30 changes: 30 additions & 0 deletions source/compiler/qsc_parse/src/expr/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2366,6 +2366,36 @@ fn interpolated_string_braced() {
);
}

#[test]
fn interpolated_string_block() {
check(
expr,
r#"$"{ {x} }""#,
&expect![[r#"
Expr _id_ [0-10]: Interpolate:
Expr: Expr _id_ [4-7]: Expr Block: Block _id_ [4-7]:
Stmt _id_ [5-6]: Expr: Expr _id_ [5-6]: Path: Path _id_ [5-6] (Ident _id_ [5-6] "x")"#]],
);
}

#[test]
fn interpolated_string_for_loop() {
check(
expr,
r#"$"{for i in 1..3 {}}""#,
&expect![[r#"
Expr _id_ [0-21]: Interpolate:
Expr: Expr _id_ [3-19]: For:
Pat _id_ [7-8]: Bind:
Ident _id_ [7-8] "i"
Expr _id_ [12-16]: Range:
Expr _id_ [12-13]: Lit: Int(1)
<no step>
Expr _id_ [15-16]: Lit: Int(3)
Block _id_ [17-19]: <empty>"#]],
);
}

#[test]
fn interpolated_string_escape_brace() {
check(
Expand Down
194 changes: 194 additions & 0 deletions source/compiler/qsc_parse/src/lex/cooked/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1157,6 +1157,200 @@ fn interpolated_string_braced() {
);
}

#[test]
fn interpolated_string_block() {
check(
r#"$"{ {x} }""#,
&expect![[r#"
[
Ok(
Token {
kind: String(
Interpolated(
DollarQuote,
LBrace,
),
),
span: Span {
lo: 0,
hi: 3,
},
},
),
Ok(
Token {
kind: Open(
Brace,
),
span: Span {
lo: 4,
hi: 5,
},
},
),
Ok(
Token {
kind: Ident,
span: Span {
lo: 5,
hi: 6,
},
},
),
Ok(
Token {
kind: Close(
Brace,
),
span: Span {
lo: 6,
hi: 7,
},
},
),
Ok(
Token {
kind: String(
Interpolated(
RBrace,
Quote,
),
),
span: Span {
lo: 8,
hi: 10,
},
},
),
]
"#]],
);
}

#[test]
#[allow(clippy::too_many_lines)]
fn interpolated_string_for_loop() {
check(
r#"$"{for i in 1..3 {}}""#,
&expect![[r#"
[
Ok(
Token {
kind: String(
Interpolated(
DollarQuote,
LBrace,
),
),
span: Span {
lo: 0,
hi: 3,
},
},
),
Ok(
Token {
kind: Keyword(
For,
),
span: Span {
lo: 3,
hi: 6,
},
},
),
Ok(
Token {
kind: Ident,
span: Span {
lo: 7,
hi: 8,
},
},
),
Ok(
Token {
kind: Keyword(
In,
),
span: Span {
lo: 9,
hi: 11,
},
},
),
Ok(
Token {
kind: Int(
Decimal,
),
span: Span {
lo: 12,
hi: 13,
},
},
),
Ok(
Token {
kind: DotDot,
span: Span {
lo: 13,
hi: 15,
},
},
),
Ok(
Token {
kind: Int(
Decimal,
),
span: Span {
lo: 15,
hi: 16,
},
},
),
Ok(
Token {
kind: Open(
Brace,
),
span: Span {
lo: 17,
hi: 18,
},
},
),
Ok(
Token {
kind: Close(
Brace,
),
span: Span {
lo: 18,
hi: 19,
},
},
),
Ok(
Token {
kind: String(
Interpolated(
RBrace,
Quote,
),
),
span: Span {
lo: 19,
hi: 21,
},
},
),
]
"#]],
);
}

#[test]
fn interpolated_string_escape_brace() {
check(
Expand Down
33 changes: 20 additions & 13 deletions source/compiler/qsc_parse/src/lex/raw.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ pub enum CommentKind {
#[derive(Clone)]
pub struct Lexer<'a> {
chars: Peekable<CharIndices<'a>>,
interpolation: u8,
interp_brace_depths: Vec<u32>,
Comment thread
HABER7789 marked this conversation as resolved.
starting_offset: u32,
}

Expand All @@ -181,7 +181,7 @@ impl<'a> Lexer<'a> {
pub fn new(input: &'a str) -> Self {
Self {
chars: input.char_indices().peekable(),
interpolation: 0,
interp_brace_depths: Vec::new(),
starting_offset: 0,
}
}
Expand All @@ -190,7 +190,7 @@ impl<'a> Lexer<'a> {
pub fn new_with_starting_offset(input: &'a str, starting_offset: u32) -> Self {
Self {
chars: input.char_indices().peekable(),
interpolation: 0,
interp_brace_depths: Vec::new(),
starting_offset,
}
}
Expand Down Expand Up @@ -348,12 +348,22 @@ impl<'a> Lexer<'a> {
}
} else if c == '"' {
Some(StringKind::Normal)
} else if self.interpolation > 0 && c == '}' {
self.interpolation = self
.interpolation
.checked_sub(1)
.expect("interpolation level should have been incremented at left brace");
Some(StringKind::Interpolated)
} else if let Some(depth) = self.interp_brace_depths.last_mut() {
match c {
'{' => {
*depth += 1;
None
}
'}' if *depth > 0 => {
*depth -= 1;
None
}
'}' => {
self.interp_brace_depths.pop();
Some(StringKind::Interpolated)
}
_ => None,
}
} else {
None
}
Expand All @@ -372,10 +382,7 @@ impl<'a> Lexer<'a> {
};

let end = if self.next_if_eq('{') {
self.interpolation = self
.interpolation
.checked_add(1)
.expect("interpolation should not exceed maximum depth");
self.interp_brace_depths.push(0);
Some(InterpolatedEnding::LBrace)
} else if self.next_if_eq('"') {
Some(InterpolatedEnding::Quote)
Expand Down
Loading
Loading