From 3f3fd9787292977c5cd3e807f97cf33fdb64302d Mon Sep 17 00:00:00 2001
From: Connor Skees <connor1skees@gmail.com>
Date: Wed, 8 Jul 2020 09:52:07 -0400
Subject: [PATCH] test for crazy interpolation in `@for` from value
---
src/parse/mod.rs | 21 +++++++++++++++++++--
tests/for.rs | 9 +++++++++
2 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/src/parse/mod.rs b/src/parse/mod.rs
index 2e11561..0801b3e 100644
--- a/src/parse/mod.rs
+++ b/src/parse/mod.rs
@@ -19,8 +19,8 @@ use crate::{
style::Style,
unit::Unit,
utils::{
- peek_ident_no_interpolation, read_until_closing_curly_brace, read_until_open_curly_brace,
- read_until_semicolon_or_closing_curly_brace,
+ peek_ident_no_interpolation, read_until_closing_curly_brace, read_until_closing_quote,
+ read_until_open_curly_brace, read_until_semicolon_or_closing_curly_brace,
},
value::{Number, Value},
{Cow, Token},
@@ -698,6 +698,23 @@ impl<'a> Parser<'a> {
'{' => {
return Err(("Expected \"to\" or \"through\".", tok.pos()).into());
}
+ '#' => {
+ from_toks.push(tok);
+ self.toks.next();
+ match self.toks.peek() {
+ Some(Token { kind: '{', .. }) => {
+ from_toks.push(self.toks.next().unwrap());
+ from_toks.append(&mut read_until_closing_curly_brace(self.toks)?);
+ }
+ Some(..) => {}
+ None => return Err(("expected \"{\".", self.span_before).into()),
+ }
+ }
+ q @ '\'' | q @ '"' => {
+ from_toks.push(tok);
+ self.toks.next();
+ from_toks.append(&mut read_until_closing_quote(self.toks, q)?);
+ }
_ => {
from_toks.push(tok);
self.toks.next();
diff --git a/tests/for.rs b/tests/for.rs
index 0aefa7e..ee73806 100644
--- a/tests/for.rs
+++ b/tests/for.rs
@@ -88,3 +88,12 @@ test!(
}",
"a {\n color: \\}}}{{{#;\n}\n"
);
+test!(
+ from_crazy_interpolation,
+ "a {
+ @for $i from length(#{\"#{\"\\\\}}}{{{\"}#\"}) to 2 {
+ color: #{\"#{\"\\\\}}}{{{\"}#\"};
+ }
+ }",
+ "a {\n color: \\}}}{{{#;\n}\n"
+);