dev: parse blocks in if/for/while more consistently

Myriad-Dreamin · Oct 22, 2024 · 0ac36e7 · 0ac36e7
1 parent 4c164c7
commit 0ac36e7
Show file tree

Hide file tree

Showing 5 changed files with 282 additions and 57 deletions.
diff --git a/syntaxes/textmate/main.mts b/syntaxes/textmate/main.mts
@@ -925,7 +925,7 @@ const ifStatement = (): textmate.Grammar => {
   const ifStatement: textmate.Pattern = {
     name: "meta.expr.if.typst",
     begin: lookAhead(/(else\s+)?(if\b(?!-))/),
-    end: /(?<=\}|\])(?!\s*(else)\b(?!-))|(?<=else)(?!\s*(?:if\b(?!-)|[\[\{]))|(?=[;\}\]\)\n]|$)/,
+    end: /(?<=\}|\])(?!\s*(else)\b(?!-)|[\[\{])|(?<=else)(?!\s*(?:if\b(?!-)|[\[\{]))|(?=[;\}\]\)\n]|$)/,
     patterns: [
       { include: "#comments" },
       { include: "#ifClause" },
@@ -966,24 +966,12 @@ const forStatement = (): textmate.Grammar => {
   const forStatement: textmate.Pattern = {
     name: "meta.expr.for.typst",
     begin: lookAhead(/(for\b(?!-))\s*/),
-    end: /(?<=[\}\]])(?=\s*[\n\S;\}\]\)])(?!\s*[\{\[])|(?=[;\}\]\)\n]|$)/,
+    end: /(?<=[\}\]])(?![\{\[])|(?=[;\}\]\)\n]|$)/,
     patterns: [
-      /// Matches any comments
-      {
-        include: "#comments",
-      },
-      /// Matches for clause
-      {
-        include: "#forClause",
-      },
-      /// Matches a code block after the for clause
-      {
-        include: "#codeBlock",
-      },
-      /// Matches a content block after the for clause
-      {
-        include: "#contentBlock",
-      },
+      { include: "#comments" },
+      { include: "#forClause" },
+      { include: "#codeBlock" },
+      { include: "#contentBlock" },
     ],
   };
 
@@ -996,14 +984,7 @@ const forStatement = (): textmate.Grammar => {
         name: "keyword.control.loop.typst",
       },
     },
-    patterns: [
-      {
-        include: "#comments",
-      },
-      {
-        include: "#expression",
-      },
-    ],
+    patterns: [{ include: "#expression" }],
   };
 
   return {
@@ -1019,24 +1000,12 @@ const whileStatement = (): textmate.Grammar => {
   const whileStatement: textmate.Pattern = {
     name: "meta.expr.while.typst",
     begin: lookAhead(/(while\b(?!-))/),
-    end: /(?<=\}|\])|(?=[;\}\]\)\n]|$)/,
+    end: /(?<=[\}\]])(?![\{\[])|(?=[;\}\]\)\n]|$)/,
     patterns: [
-      /// Matches any comments
-      {
-        include: "#comments",
-      },
-      /// Matches while clause
-      {
-        include: "#whileClause",
-      },
-      /// Matches a code block after the while clause
-      {
-        include: "#codeBlock",
-      },
-      /// Matches a content block after the while clause
-      {
-        include: "#contentBlock",
-      },
+      { include: "#comments" },
+      { include: "#whileClause" },
+      { include: "#codeBlock" },
+      { include: "#contentBlock" },
     ],
   };
 
@@ -1049,14 +1018,7 @@ const whileStatement = (): textmate.Grammar => {
         name: "keyword.control.loop.typst",
       },
     },
-    patterns: [
-      {
-        include: "#comments",
-      },
-      {
-        include: "#expression",
-      },
-    ],
+    patterns: [{ include: "#expression" }],
   };
 
   return {

diff --git a/syntaxes/textmate/tests/unit/basic/control-flow-for-content.typ.snap b/syntaxes/textmate/tests/unit/basic/control-flow-for-content.typ.snap
@@ -187,8 +187,6 @@
 #                  ^ source.typst meta.expr.for.typst
 #                   ^ source.typst meta.expr.for.typst meta.brace.square.typst
 #                    ^ source.typst meta.expr.for.typst meta.brace.square.typst
-#                     ^ source.typst meta.expr.for.typst
-#                      ^ source.typst meta.expr.for.typst meta.brace.square.typst
-#                       ^ source.typst meta.expr.for.typst meta.brace.square.typst
+#                     ^^^^ source.typst
 >1
 #^^ source.typst
diff --git a/syntaxes/textmate/tests/unit/basic/control-flow-for.typ.snap b/syntaxes/textmate/tests/unit/basic/control-flow-for.typ.snap
@@ -187,8 +187,6 @@
 #                  ^ source.typst meta.expr.for.typst
 #                   ^ source.typst meta.expr.for.typst meta.brace.curly.typst
 #                    ^ source.typst meta.expr.for.typst meta.brace.curly.typst
-#                     ^ source.typst meta.expr.for.typst
-#                      ^ source.typst meta.expr.for.typst meta.brace.curly.typst
-#                       ^ source.typst meta.expr.for.typst meta.brace.curly.typst
+#                     ^^^^ source.typst
 >1
 #^^ source.typst
diff --git a/syntaxes/textmate/tests/unit/basic/space-control-flow.typ b/syntaxes/textmate/tests/unit/basic/space-control-flow.typ
@@ -0,0 +1,16 @@
+#let A = []
+#for i in range(0, 10) { A } { A }
+#for i in { range(0, 10) } { A } { A }
+#if { true } { A } { A }
+
+#for i in range(0, 10){A}{A}
+#for i in { range(0, 10) }{A}{A}
+#if{true}{A}{A}
+
+#for i in range(0, 10) { A }A
+#for i in { range(0, 10) } { A }A
+#if { true } { A }A
+
+#for i in range(0, 10){A}A
+#for i in { range(0, 10) }{A}A
+#if{true}{A}A