From 8a9d50043d58eedf1e375b0e2059e43efd856902 Mon Sep 17 00:00:00 2001
From: Dmitriy Pleshevskiy <dmitriy@pleshevski.ru>
Date: Wed, 21 Jun 2023 12:16:49 +0300
Subject: [PATCH] grammar: some cleanup

---
 grammar.js          |   8 ++---
 src/grammar.json    |  70 ++++++++++++++++++++------------------------
 tree-sitter-d2.wasm | Bin 73813 -> 73776 bytes
 3 files changed, 34 insertions(+), 44 deletions(-)

diff --git a/grammar.js b/grammar.js
index bbcc51e..7395f02 100644
--- a/grammar.js
+++ b/grammar.js
@@ -86,11 +86,9 @@ module.exports = grammar({
       seq(
         $._connection_path,
         repeat1(seq($.arrow, $._connection_path)),
-        optional(
-          seq(
-            optional(seq($._colon, optional($.label))),
-            optional(seq(alias($._connection_block, $.block)))
-          )
+        seq(
+          optional(seq($._colon, optional($.label))),
+          optional(seq(alias($._connection_block, $.block)))
         )
       ),
 
diff --git a/src/grammar.json b/src/grammar.json
index 1d2930d..3766456 100644
--- a/src/grammar.json
+++ b/src/grammar.json
@@ -89,66 +89,58 @@
           }
         },
         {
-          "type": "CHOICE",
+          "type": "SEQ",
           "members": [
             {
-              "type": "SEQ",
+              "type": "CHOICE",
               "members": [
                 {
-                  "type": "CHOICE",
+                  "type": "SEQ",
                   "members": [
                     {
-                      "type": "SEQ",
+                      "type": "SYMBOL",
+                      "name": "_colon"
+                    },
+                    {
+                      "type": "CHOICE",
                       "members": [
                         {
                           "type": "SYMBOL",
-                          "name": "_colon"
+                          "name": "label"
                         },
                         {
-                          "type": "CHOICE",
-                          "members": [
-                            {
-                              "type": "SYMBOL",
-                              "name": "label"
-                            },
-                            {
-                              "type": "BLANK"
-                            }
-                          ]
+                          "type": "BLANK"
                         }
                       ]
-                    },
-                    {
-                      "type": "BLANK"
                     }
                   ]
                 },
                 {
-                  "type": "CHOICE",
-                  "members": [
-                    {
-                      "type": "SEQ",
-                      "members": [
-                        {
-                          "type": "ALIAS",
-                          "content": {
-                            "type": "SYMBOL",
-                            "name": "_connection_block"
-                          },
-                          "named": true,
-                          "value": "block"
-                        }
-                      ]
-                    },
-                    {
-                      "type": "BLANK"
-                    }
-                  ]
+                  "type": "BLANK"
                 }
               ]
             },
             {
-              "type": "BLANK"
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SEQ",
+                  "members": [
+                    {
+                      "type": "ALIAS",
+                      "content": {
+                        "type": "SYMBOL",
+                        "name": "_connection_block"
+                      },
+                      "named": true,
+                      "value": "block"
+                    }
+                  ]
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
             }
           ]
         }
diff --git a/tree-sitter-d2.wasm b/tree-sitter-d2.wasm
index 1bff848d4a0646ad4888377e856bded0452a655a..06e0feb52af488ea5134217885e25a3ad892cea0 100755
GIT binary patch
delta 1058
zcmZ9K%S%*o6vuz(_q(Gr-TBSj8OPE^_M5AcnbpkX1GRE4HCovlp$vLhDm^xhO1de*
z79|Niev1~8P*i45<<_F0vPID%p@PaNC}`0iP_zo_oLd&Oxu4&8e$P4F*OSKhq;Y!B
znQXV|-{0NaeW-132jdf;dLh>e3z6evdIx_3LH!uY1(OT)8BqF=2=dT;?>Qp;Dje$R
z>gd?jy}zfYqia`tidlhNV8z^o$gJ-_c-Va^h6AAs0m$huW{x^&`%0M3%9ONB1!bH$
zKUkAA^jp~vptpvS!1Z7#8xp^xmXR^iL7}7JJ`A4>r!f35oCTp1R$(g0O`cYK5rd3m
zieWeU7>$xS5Elv@s0Tv<=>#K;DX{cKs}y|tnN<#k{%Tdm43YL~Z0^<DSnSjFkyJyj
zi4***#NLvbLBk|Dk&zs`i~qa-*~o5^LSKz6?Ke!3c32#RvE1g4-Dspy4;;_qj{weV
z3kMF^%n^+eN1e$-Ero$*iFe=`NxS^52{MzJmJc)j&gbB|K`>DZ^L>swP{Ncj6A6HR
zJP;kmrW292m6MU6@Id7LJ%SfTMN@B&wt~;S6D<I|_Ea8T`)n+`ie^y$CcG%eS>s#@
zN>+xa6ZS^2QAsglMvEQ_syS|CVKuXadpEW(08zK7XaFG3y)dtm@J7uge2X6ii0Nc$
z%spN_hEF$H`e4Q*=D#M-yRw&r>*XGfRGgwhxp*O=c1b(O-XlprLXR$ekG^A-c@#QV
z6(iiJ&L!Nb@ziT-y|TS^HRK$w&nHYQQ-oK`1B4GNFeU2x(`yJ@oFybMu(E(KoXJv(
zY$_%sS1%^)UNeW#x3+|EzS$&<t(%R|lk0z?F}Z;<^z=qDrZ>$Z<MZaPXuREme|Mg{
zspSzzSX=8T)Vys9@^xYBB|Tkc>8Vx?`EJ|x7Znh7Q^yBs(Zo=``*Lt6jg%NVT!^Kk
zmm8?jmn#bhk*j+MJ!4gbYu7wW-q=P~=gm0b#H|X#-P<&$`+U5`kDBp&A5jbLw{-pj
D3S8TV

delta 1015
zcmY+BT}TvB6vywqGrR6OGrP0vWJ)ZKyK3e~;`&8ux<jmHW@<{Tfl8)*7*V<+29Y9#
z2!hHbitMq{3cs3%>ZQzxo}ylSD1)MU5DI#z2Lt;!XV=nR=6BCM|8vg&o|#(^mlnja
zw(%wBcw2b>Q<z$v4neS5cnf<*CH{nFFe39hA)6`NdA;D{15`{V4o6RSM@MV;WKT~=
zcWb+!IPEc%_?Sf1*y}%;!+b7G*ws}#wf6gnp`Y?vQV0w1vx+}Ioe?h!Di$H2GnI+~
zof=f9>CEP$1PNJ%$}y4@35+#TsaW`|(oY%BapY2gA8~Xgh|#QS31S0O$}U1=k-vBJ
zfw0Nx2jPgbi;Dc0GqGutM35K^&L%Xd5S_p{{D>70fR7R?Zb*dyD5Hi@3uY0U+{&<@
zDm9hH@H1)#%)6%MYxpc|=w*@SUg&J)A5?#d4IlK^Xr!$|B-tXN7a^z!&{+6yd_-e-
zD;1G9xbiwJk`ORRGK)GQhPOftz$|KjrS;`8uVBzlFEfM+1>S+HL><i0AyKUel1_q{
z*{G3;L?qP;ihtfD{?!%F3*8}VHAmeE6xKNvhwEI9!*$kZNz}?uYaT271EPxNn0CTW
zUFHwZAf;~ed{RDQUiTngCSRcZYLjX<`(~ntZK>;r*J*E}H&4?Sqle2G>xbi616aJ0
zor%zL+8Ojemumy?!MtU-YsrtpRCj@f7%GfGj21;4xOYX$%8HBdvbSUlVx&|@Oz*ZM
z?w5hYWqvHLLS!2`IG}k?0-`tAg_4yDA41-{6H!vN716LS1<_Y6AujHZ2k?oS-w;e3
zKm|8zF)-_5F?dw}4T5_I`%s<P_?Q7cA1cOFTIdDU`1jBazUoo=R1>F~S$g<Y78p>5
zhSA5B;V?oP=}m;P!JFmSWbxJx#Fxo7MD6VY#HBltXytAQBV#%ladajNF*b`H&B?h&
Q8_ZjK@DAp@eb{*H4@V~5rT_o{