handle start and end delimiters as seperate symbols

The start delimiter triggers `trim_blocks` and the end delimiter
`lstrip_blocks`.

src/jinja.ts

@@ -14,13 +14,17 @@ export interface Node {
 	nodes: { [id: string]: Node };
 }
 
+type DelimiterChr = "" | "-" | "+";
+export type Delimiter = {
+	start: DelimiterChr;
+	end: DelimiterChr;
+};
+
 export interface Expression extends Node {
 	type: "expression";
 	delimiter: Delimiter;
 }
 
-export type Delimiter = "" | "-" | "+";
-
 export interface Statement extends Node {
 	type: "statement";
 	keyword: string;

src/parser.ts

@@ -87,8 +87,10 @@ export const parse: Parser<Node>["parse"] = (text) => {
 		}
 
 		if (expression != undefined) {
-			const delimiter = (match.groups.startDelimiterEx ||
-				match.groups.endDelimiterEx) as Delimiter;
+			const delimiter = {
+				start: match.groups.startDelimiterEx,
+				end: match.groups.endDelimiterEx,
+			};
 
 			root.content = replaceAt(
 				root.content,
@@ -108,8 +110,10 @@ export const parse: Parser<Node>["parse"] = (text) => {
 
 		if (statement != undefined) {
 			const keyword = match.groups.keyword;
-			const delimiter = (match.groups.startDelimiter ||
-				match.groups.endDelimiter) as Delimiter;
+			const delimiter = {
+				start: match.groups.startDelimiter,
+				end: match.groups.endDelimiter,
+			};
 
 			if (keyword.startsWith("end")) {
 				let start: Statement | undefined;

src/printer.ts

@@ -44,13 +44,13 @@ const printExpression = (node: Expression): builders.Doc => {
 
 	const expression = builders.group(
 		builders.join(" ", [
-			["{{", node.delimiter],
+			["{{", node.delimiter.start],
 			multiline
 				? builders.indent(getMultilineGroup(node.content))
 				: node.content,
 			multiline
-				? [builders.hardline, node.delimiter, "}}"]
-				: [node.delimiter, "}}"],
+				? [builders.hardline, node.delimiter.end, "}}"]
+				: [node.delimiter.end, "}}"],
 		]),
 		{
 			shouldBreak: node.preNewLines > 0,
@@ -67,13 +67,13 @@ const printStatement = (node: Statement): builders.Doc => {
 
 	const statemnt = builders.group(
 		builders.join(" ", [
-			["{%", node.delimiter],
+			["{%", node.delimiter.start],
 			multiline
 				? builders.indent(getMultilineGroup(node.content))
 				: node.content,
 			multiline
-				? [builders.hardline, node.delimiter, "%}"]
-				: [node.delimiter, "%}"],
+				? [builders.hardline, node.delimiter.end, "%}"]
+				: [node.delimiter.end, "%}"],
 		]),
 		{ shouldBreak: node.preNewLines > 0 },
 	);

test/cases/expression_whitespace/expected.html

@@ -2,8 +2,8 @@
   {{- some_variable -}}
 </div>
 <div class="extemely_long__class_name extemely_long__class_name--modifier">
-  {{- some_variable -}}
+  {{ some_variable -}}
 </div>
 <div class="extemely_long__class_name extemely_long__class_name--modifier">
-  {{- some_variable -}}
+  {{- some_variable }}
 </div>

test/cases/statement_whitespace/expected.html

@@ -1,6 +1,6 @@
 <ul>
-  {%+ set seq +%}
+  {% set seq +%}
   {%- for item in seq -%}
     <li>{{ item }}</li>
-  {%- endfor -%}
+  {%- endfor %}
 </ul>

test/cases/statement_whitespace/input.html

@@ -3,4 +3,4 @@
 {%-for item in seq   -%}
 <li>{{    item}}</li>
 {%- endfor%}
-</ul>
+</ul>