From 16d8b4c5f7b560f55d6e723c7a8a975a98adac0b Mon Sep 17 00:00:00 2001
From: Dmitriy Pleshevskiy <dmitriy@ideascup.me>
Date: Sat, 10 Dec 2022 23:09:11 +0300
Subject: [PATCH] remove unnecessary choice

---
 grammar.js          |  14 ++++----
 scripts/pre-commit  |   1 +
 src/grammar.json    |  77 +++++++++++++++++++++-----------------------
 tree-sitter-d2.wasm | Bin 37493 -> 38133 bytes
 4 files changed, 43 insertions(+), 49 deletions(-)

diff --git a/grammar.js b/grammar.js
index ed4e121..234e513 100644
--- a/grammar.js
+++ b/grammar.js
@@ -132,14 +132,12 @@ module.exports = grammar({
       ),
 
     text_block: ($) =>
-      choice(
-        seq(
-          alias($._text_block_start, "|"),
-          optional($.language),
-          /\s/,
-          alias($._text_block_raw_text, $.raw_text),
-          alias($._text_block_end, "|")
-        )
+      seq(
+        alias($._text_block_start, "|"),
+        optional($.language),
+        /\s/,
+        alias($._text_block_raw_text, $.raw_text),
+        alias($._text_block_end, "|")
       ),
 
     language: ($) => /\w+/,
diff --git a/scripts/pre-commit b/scripts/pre-commit
index d33227a..6b06a4e 100755
--- a/scripts/pre-commit
+++ b/scripts/pre-commit
@@ -9,5 +9,6 @@ if [ ! -z $(git diff --cached --name-only | grep -e "^grammar.js$") ]
 then
   make build
   make build-wasm
+  git add src bindings *.wasm
 fi
 
diff --git a/src/grammar.json b/src/grammar.json
index babb67c..7f29429 100644
--- a/src/grammar.json
+++ b/src/grammar.json
@@ -538,55 +538,50 @@
       ]
     },
     "text_block": {
-      "type": "CHOICE",
+      "type": "SEQ",
       "members": [
         {
-          "type": "SEQ",
+          "type": "ALIAS",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_text_block_start"
+          },
+          "named": false,
+          "value": "|"
+        },
+        {
+          "type": "CHOICE",
           "members": [
             {
-              "type": "ALIAS",
-              "content": {
-                "type": "SYMBOL",
-                "name": "_text_block_start"
-              },
-              "named": false,
-              "value": "|"
+              "type": "SYMBOL",
+              "name": "language"
             },
             {
-              "type": "CHOICE",
-              "members": [
-                {
-                  "type": "SYMBOL",
-                  "name": "language"
-                },
-                {
-                  "type": "BLANK"
-                }
-              ]
-            },
-            {
-              "type": "PATTERN",
-              "value": "\\s"
-            },
-            {
-              "type": "ALIAS",
-              "content": {
-                "type": "SYMBOL",
-                "name": "_text_block_raw_text"
-              },
-              "named": true,
-              "value": "raw_text"
-            },
-            {
-              "type": "ALIAS",
-              "content": {
-                "type": "SYMBOL",
-                "name": "_text_block_end"
-              },
-              "named": false,
-              "value": "|"
+              "type": "BLANK"
             }
           ]
+        },
+        {
+          "type": "PATTERN",
+          "value": "\\s"
+        },
+        {
+          "type": "ALIAS",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_text_block_raw_text"
+          },
+          "named": true,
+          "value": "raw_text"
+        },
+        {
+          "type": "ALIAS",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_text_block_end"
+          },
+          "named": false,
+          "value": "|"
         }
       ]
     },
diff --git a/tree-sitter-d2.wasm b/tree-sitter-d2.wasm
index bca3b6a53d4695e99579532e9b3e596d207c5598..96a1442a3e3909c5405b193d6bea0f8a31cb769b 100755
GIT binary patch
delta 2119
zcma)6T})eb6u;-+Qo7z2ZejgcQMd&Pg+igFUwjn`D_dc(@u4sVUdmP#SYa#8bY=>R
z+k^4JkE4l+B%5<;oSIGh<TTl)k1iAAt26FF6MZw;5??f)|Lw{aqS1$Y?)jhZ-|v6!
zy?2q_`;c8(U~F~<msn*HV;TT_iFs|H(J&~c6M#+!YeGyAi_Zp6=5DgLbkK~~HMPc2
zW<K@Q!gBnC;PP<8S|F2JK0?R3{mS&nc(zSZ{L87t$hhM3DatdM<S}I-o5~~(tj6Qx
zZAv^oKQ_djp-k#TDzlnWy~*rKCNV)y?h7c1iB{5u`Y=@-%9s3y_<V~4+j_*0q-Yp-
zXls~%&D@@N>=-3B1n|6}Nemu7no4Hq+}MFPOfG!7)P%Qo>|mZg+|;}9uN{@FsU52<
zRoHDv5;NxvzcO!+>bopfu$BPND&q`fQioU4X--jEXbs_p(JS`*<LNYUA^2w1jHIz0
z{P?yp0ByKwTw;L^weqm843|x3Ac)sZ_2?)O<xs^Is<w3U*+iNXHla`{UM<{DX?|36
zMR=;j#3B*i4A;#fYwyPMyS#X}L}DEss`YlciFFpBS)mKpO6Q;(e=0r2qG1*Bi&8o3
zQRg*mk<p8rQWuN$snxp77S<QWE9K49V+{K7dvh)9#y`xDvUr4>UpE_J07uJOU=N-q
zxfeeztJU>)@=HaZ&P(7#+*$6Uq=9l-mx!y5=S}^&%jJUrgLvF-Gewd|kFFd}W>ZAp
z5LQ~c**?yWA78Pwz%X93IAH|uSiG<wCF@N%fVZuuVH6dcoAq_#cTx+gQ0G<DB^6c_
z?Nw~7Uqvu&x57AesUi8M-31f)g*^z5;qP{z?(xEyk6_eNj{6M;OzwJ>dE0Q#X2mL#
z39SzES|GA@A^&^L==S+-O?Gg&|FPWLS2Qr6T;=P%uTt%cUpp+t=`<Op0{mOVVTZZs
zpiDlz;jrm>C!Zn=qT*<WY5dZ$zz((Y^|tNyQ_f6DHj_#zs|#8BK9wVWVHOuF{JJL$
zAH4=MxeFER#cW-JwKa<sGPs!_vADKZ2Cf^;f)E3z*2qNMsOi&kJ@;dc6QV1iS*sCZ
z(o!|66=W9EFUo@Ck{QW5iV|3F-pHi-xJl4ZJ*r%-QH_!tqpn@e4UVl4lOT$8kQS+y
zAnpWMqdIisBpYQx2FZhGTpw5uiX!=C!OgVNeI2A}jMeoNby4UHo~_F|o1J`!YMD_K
zWqN5QuEyA6hzyJt#Zm8BYvm2-<f|s9{z05xjnh*XCi&@UbI6*QOmpR1gJhE?9R=OW
z^&n0A5EJTjAu7o@WNnDuXNO64Cs*?rr^KeMG$7D~R1Ky{h)QXS$f9T{Fk&RoF)i60
zL{EVOK{_Nhs%!{krVN5KfN#|Ag8<&CZ!!d{HN$j~+-P%GK^VjCNNL0&12?*vM4&tH
z1$Rwlr(8s>AWH-ZvbNB3IDZRWc+G8%bgP6!)hY5Ll1?Op)G0-2`T|rwgGK5Q-TCBR
zG&R^DhOUOhTznfQojR|mrx%skBU<u`ldup}qJEHrEha0?S_m6b4Kd@Q=vN&NBfr&9
zLBFBj8nVp;9Lxhw9-Qvq9OqgZ70alE)QK-QHq$Tb^F|LO@aIN1$r4Ww{c=V;J{ZGw
z&)#+(C<9*~^+hMq%uSs17+d1B31YR7-vWW}F#jGv8pIzwQ)b#=sX9N6lW+7uF5aZ*
zK*_!5Zv>db&9?I-j|V;`Ss8qn<X6FSB<DliQX0Mh$=qjQJA)*C(|!jO{G{U|>0_N&
z$zkfM1enLB?vo_n@4iHi(dZ!Q8_`M9??#`5`P`wNcS@<>pCgi<Y$cP|De>FMOIiwh
eZssZl1ZVqs`IE{RmA|R{LNYfuM^QVIN#Ec8^85Ax

delta 1483
zcmYjQUrbwN6u;-Rv>mslU;oh2QsB0ua4Ee7$|$A4+6(I(1NH~TV9c$X8(Zico3k;|
zX_$#G#<*o1A52V~&LsxilEuac_o6=dU^Fq)C&P=HIAe^mJ?ue~C7yd>%;xr&^PTT^
z&iS45ecz*Hd~_4<%p)F}qO;gYS1?&?L9knZe>NK|O1dQ5zv+6R@*}=$gY9(Bo*>1#
z1!GxibjRq=>HxM3(KSbmRJjpb`{=y8iO$F;P)(cM6|a-fc?a8aOlqZ7XAtAt%}^1x
zQj^OG?evwWgO0eiVB)Bm=q*<tYAJeHm!$8jsxa9@-`O-$YX-3+yOG{YmjcyvqvjRp
zqy~2ix@f<<0aCQ!E?{@Y3|;ZcEO*VF!=9|^I3`?}exlk%*Toj-rDbs(GF0t(75jQk
zRkuAp$g-l0tv_3w-8)L1u6A1RIdNc!9=MZq+FOf*y`=jzTJcW64tnfuZpzg&b+X)D
zET+28%`c3cD-<S14;Cl8jZex`-j@ZPF8MlOh(2K)rd3}v>{#-jha6q-E3mV2&A$Xy
zg$U=NpM8EB2*|jrpSw*No#Hb_<0<+)&;h&Yk3a-QNZy*nJp~?3l#Xs)hEcNDy$)ma
zW}Rvq?B7(*O+%U<)SbfdVN?Gb!2s-~_k!CPzX--)AN>~Wf&Ek;>VgAH{s=9EZbKV|
z>wB<cJ9#Y4B*Gq;phCD0Cl&g(K173II}~U!JdX!E%`@gx@=n#1FV4*sUz{(O=Pnjc
zrKCfoHKc6Q)qh`wsmff#Wjn4R{oY)v(IH}0Kt)Ml!3FeuY^d^SECS98U|HNI>Edh@
zn`xmn&>&%6LETYOP}CJ%k|l3OMJ)=d=pavPPz!}N2`)*Nc_B*8k|N1|fJH?TwGm*9
zDUt%Bg{E6S4ot{0?<<muR<U7&m?XcNtLkOy6wRpRh#En*qedN8D%un@O&v>VcA$vU
zUuyflcB25V5>Z3XQ=Y@*Ik*Z6jsMAzV$l`WwOLvc2j#daLJApD*c3XgwT(ds4a5`i
z&ZuSFnm3$LiDTiV5niz*9m;90v_2EvSrRE)if7#2Aq5P&ih@=2&`<GgeCChi;WI`{
z(TxgbFS@l9MUgSJ^>IRLNdca)V4H~`(rke-W^39|#ok(xmDTlW_M4eDDy<8T81o&V
z%k3k(^4v#+2mRy-Y(}&$JB&0ShUD6HBf^13Sri4fWIKCV_Y>MKawmfPRN4~tjD<v5
z)4A!=(<wb&g*L}&6=Sm3sFtSt35_3@Uu%b*l-E?oc`e6JW?Ackaaz@O`=iqO9g~cE
zVq7i|1$s6)<KbH(qW|kkuY8>>+F+&<>xly#rv2#;7$2r@F}~mX5#vziI^(Yy!*jLo
z2FzAc**b(-8XforW=I>n$@UL}cX{LO9gP4-=vMA!#+LjFZ`{l8VLPl(vt8Ct!;#9W
z{-GOYDz6<74)$F+{3QqOn_aOo?cZZ}nebV0*hv4+i3v_W_S}8O?vuxv_0Gu?UH<{r
C;!t7$