From 166c5283d9be6c4297c45db4055ac393a5fd2bbb Mon Sep 17 00:00:00 2001
From: Jelle De Loecker <jelle@elevenways.be>
Date: Wed, 7 Feb 2024 16:30:56 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=92=A5=20Newlines=20are=20no=20longer=20a?=
 =?UTF-8?q?n=20expression=20delimiter,=20only=20semicolons=20are?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                     |  1 +
 lib/parser/expressions_parser.js | 27 ++++-----------------------
 test/10-expressions.js           | 16 ++++++++--------
 3 files changed, 13 insertions(+), 31 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00e2c1a1..0746730f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 * Fix custom-element render issue with overlaying variable instances
 * Fix setting `value` not working server-side on `<textarea>` elements
 * Add `Renderer#handleError()` method
+* Newlines are no longer an expression delimiter, only semicolons are
 
 ## 2.3.15 (2023-11-27)
 
diff --git a/lib/parser/expressions_parser.js b/lib/parser/expressions_parser.js
index 9babc7ed..a373977f 100644
--- a/lib/parser/expressions_parser.js
+++ b/lib/parser/expressions_parser.js
@@ -31,7 +31,7 @@ const Eparser = Fn.inherits('Hawkejs.Parser.Token', function Expressions(source,
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    2.1.6
- * @version  2.3.3
+ * @version  2.3.16
  *
  * @param    {Object|string}   line
  *
@@ -74,28 +74,9 @@ Eparser.setStatic(function compileBlock(config) {
 
 		if (token.type == 'whitespace') {
 
-			if (literal_count) {
-				// If we're inside an object or array literal,
-				// newlines do not start a new expression
-				nl_count = 0;
-			} else {
-				nl_count = Bound.String.count(token.value, "\n");
-			}
-
-			if (nl_count > 0) {
-
-				if (line.length) {
-					// Only push non-starting whitespaces
-					line.push(token);
-
-					lines.push(line);
-					line = [];
-				}
-			} else {
-				// Only push non-starting whitespaces
-				if (line.length) {
-					line.push(token);
-				}
+			// Only push non-starting whitespaces
+			if (line.length) {
+				line.push(token);
 			}
 
 			continue;
diff --git a/test/10-expressions.js b/test/10-expressions.js
index 69aec42d..82b6f878 100644
--- a/test/10-expressions.js
+++ b/test/10-expressions.js
@@ -575,13 +575,13 @@ NO
 			],
 			[
 				`{%
-					if false
-						set my_val = "if"
-					else
-						set my_val = "else"
-					/if
+					if false;
+						set my_val = "if";
+					else;
+						set my_val = "else";
+					/if;
 
-					print(my_val)
+					print(my_val);
 				%}`,
 				'else'
 			],
@@ -784,8 +784,8 @@ This should be a converted variable:
 						**cool**
 					{% /markdown %}
 					{%
-						print('-')
-						print('-')
+						print('-');
+						print('-');
 					%}
 				`,
 				`<span>»123«</span> <p><strong>cool</strong></p> --`