From ea80d53a167f71010a430e435aed7b9a68d4487e Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Fri, 3 Mar 2023 20:08:13 -0800 Subject: [PATCH] upgrade chroma --- d2renderers/d2svg/code.go | 4 +- d2renderers/d2svg/d2svg.go | 8 ++-- .../d2svg/dark_theme/dark_theme_test.go | 9 ++++ .../testdata/code/dark_theme.exp.svg | 39 ++++++++++++++++++ .../TestCLI_E2E/internal_linked_pdf.exp.pdf | Bin 80839 -> 81564 bytes go.mod | 5 ++- go.sum | 8 +++- 7 files changed, 64 insertions(+), 9 deletions(-) create mode 100644 d2renderers/d2svg/dark_theme/testdata/code/dark_theme.exp.svg diff --git a/d2renderers/d2svg/code.go b/d2renderers/d2svg/code.go index 029b635e2..3d6e75306 100644 --- a/d2renderers/d2svg/code.go +++ b/d2renderers/d2svg/code.go @@ -3,8 +3,8 @@ package d2svg import ( "strings" - "github.com/alecthomas/chroma" - "github.com/alecthomas/chroma/formatters/svg" + "github.com/alecthomas/chroma/v2" + "github.com/alecthomas/chroma/v2/formatters/svg" ) // Copied private functions from chroma. Their public functions do too much (write the whole SVG document) diff --git a/d2renderers/d2svg/d2svg.go b/d2renderers/d2svg/d2svg.go index 54a3d46e0..f769b94e7 100644 --- a/d2renderers/d2svg/d2svg.go +++ b/d2renderers/d2svg/d2svg.go @@ -15,10 +15,10 @@ import ( "math" - "github.com/alecthomas/chroma" - "github.com/alecthomas/chroma/formatters" - "github.com/alecthomas/chroma/lexers" - "github.com/alecthomas/chroma/styles" + "github.com/alecthomas/chroma/v2" + "github.com/alecthomas/chroma/v2/formatters" + "github.com/alecthomas/chroma/v2/lexers" + "github.com/alecthomas/chroma/v2/styles" "oss.terrastruct.com/util-go/go2" diff --git a/d2renderers/d2svg/dark_theme/dark_theme_test.go b/d2renderers/d2svg/dark_theme/dark_theme_test.go index 509c88804..cecc57625 100644 --- a/d2renderers/d2svg/dark_theme/dark_theme_test.go +++ b/d2renderers/d2svg/dark_theme/dark_theme_test.go @@ -373,6 +373,15 @@ darker: { style.font-color: "#fff" style.fill: "#000" } +`, + }, + { + name: "code", + script: `code: |go +func main() { + panic("TODO") +} +| `, }, } diff --git a/d2renderers/d2svg/dark_theme/testdata/code/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/code/dark_theme.exp.svg new file mode 100644 index 000000000..9aec596fd --- /dev/null +++ b/d2renderers/d2svg/dark_theme/testdata/code/dark_theme.exp.svg @@ -0,0 +1,39 @@ +func main() { +  panic("TODO") +} + + + \ No newline at end of file diff --git a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf index 1477cb8235387f6eb55e6002aa4559474154f211..fa9a5a4adb8588327307d577228f75d284db78b1 100644 GIT binary patch delta 5084 zcmZWt2T)YY(q=)@ihzg+g0Lz{5ZD|Df&!9r7EvTAuw+pXS+GR2J8a* z@J1=X5XLAgF(9xCWs|86S4_g79F*Zso9N_mL^P`@abg8iZ#%#Gi2b&L??hj=^pR$x zhJniWR5W5hGF}-KSsASxysM<*CF>Z2k#oLV2 z=eEonWcWTS(7e6!_XDxW!!w4jwuyuy{W)bqSO2VGNS;pYY{I#+omE~|Hcz*KZaY^H zY808t)$iZ3?b%5umvF{QgU`fvFJJW2$)}T-386z>Lm$t|EDr@WV(a(j>zA$*b~sMA zeYU%YED=2Y!c`(dW-aloJW-Je5w=ZzU&8Bl5j$4$oDDYE!#AtDs$WaMYU^teCrw=9 zSEqT%$WBkGIQ%{qsE`|h0NlUND6G@!I*ifBIWaALYW2~~fZEcW)c|cfIX}HvKF7i5EoAD&_vlOe~iGP*LMLrNH zZ+>muA+XGf=hEd|7h}ccd_|#e z_pxy8D~4UJ;OY;|rbQ2^mC7iO#!V%*MjTf2#%*={6303k=<$-fA}-DAEI-ffZx6qz zg1$3lAOMMlpfC_54g*1vRyYV8iG!e_5H$Rk4~>8rLXdD21dAjAkVq2fCmset!%z?u z{AVJPw8lWtC^!U8LL;$IQXEH`(GUzNjwa=y(WE>y`kxsGK_N&sf@C965CBCggdu@Z zFj6vxG$U{j1QY>5prF6zU(BGSqDVLd1tle-NH`P;heDB>qakqIKYkK9IFe+O8X|Eh z2%Hqh!b#135hr0t_RkOTGY%v5K#(?qL>3UJddbOg7~%%=)$5&tU@|BjMbGN z<-VZuU2Vvl#!njb@%by5A0|y*bVS%i95I)c@_g-5K35Al8EL$lRg(xiaQr7ibv_eB zPIi1sMh5zM(7SKQ7>O7#F9iyNA?A5rBGR#d0W=c)zdv+*=A4dyg_~MPU<^B05BVezWa=xfVKeELfXNsO7&-%Nd(KFE?QOlP4I|#+M*}7+Yf;5|~i|zsV zuGgsm(nbd!dwFWjVShXStc+eiC)5q$F-_v}!OYV|X{$zxY}I!~Vw{ zlWa8f^bCB>#5R|#k`g{9aByQdVPo=Lox0iwy(=;8-5t|usZIz)*+PudoQ0~e$aA$p zy)WAf3ol;$bxR@%=+0sRe~c05KQOFVEYx|&a6sjEVe(yLqf8~=7=k%utJ$=TP^~`S zJ0l`;(>c-Oa3w{ACI%}j3cS+8+oy^jS2|=@}7SWR0%aF`3TZXX(i`NorVIg_VaU;`d zZbdY}hERFi-#hvVWN608TWEnEkUR6eAEr%GPrif-(fft$=XGkXUy!8daN(6l?>V1} zH=eC47%i0py4&@`*x=rO4I^%`|!XsGG5}7B?o_ zEGgx#sho@_ikhvbPsultbH*~UDPocQdlzeXi!!rXgK_(2t6lG7no>L)c-l&Xq$yS2 zit7lJ-j5XJM|&k0(l#*DLv8bn>Kivyvfu=aWUlGet;P}K9!-9_WkBZ z28i3%*h?h6o{w6?B#)xwZn1K%XLFd_V^!b`cOnvfPux8P6L)1wua)RA5)rgQ;u(Al}oRJ)7ve>;Hb$F9>L?s_P$0b zwR~~88$A#Dk4Ijon`pV46&kx6>%(q2wN8OmQ{qLc1ts45&rrAOI6#Tc2y>#>AB z@aXA3bqdVD7q^`Rb)9ufgh2HrxPZ_{LmdKw<2*s$nI0j8a|{+-%a-H#j`{0*i16Vz zE4njS%lk3q8+OMJccg;&O@oNW0p25~i+ZKs*Zg5$FPK(#MA+N2=_SGqe`KcjY0ES6 zD0rU{Ax037V+%SEase59wOAg58?)GB)&se@!tsn9w_`GuAebuj_3Yj&wL2mNrQNq? z(I?~D?_5u4pYHQG^fh!oalsr`2&=*>7T%piIq5%~$IpoGDQoC1Z$7F=K&A?X*2q+iz{6|^MzlD<7ta@xLd{|wx7GKXpL!2!F% zET3tAjgu9{f5mIPe7Pm>r*_pQ?`x@jsOI>;2$QE3+5f25Rys+&Ixg~3V35dv)Qbi{ zz)-dh4l^n~rbM+U`LL>Ay~^F#l#?v~XzKmY{GsC) zUf-($9|hKM`@q<)+t}R8#KGHSEAAIB#B>HX&QjF4aqZo*x5+aZ^t~G5wN6p+d1gt; zuD^O8<}YZx7eFZntXr(f8P9r|<>}`R+r0q5vn8G zWDqyZ!z^uW-iYR+$hXo1S5sf=o!IcQOMhUE&3<^E;uK(oz=E$%Nmm+ITHdF6fEq&z zzbaK!rt{AG)QOZxedLn!$Q>L_Mz+uqbCc<-6&qk_U_5pSL~ywzB@SIBXS%=`O;a1{ zN1J?wi;4;z*r#t@L>4D&h0WGosv4-suE-vy87iao@*+@+OqjC-QBDc-cK6hIcr!AH zb73!Yu>v$De|^u;F8!>0&R=RcE3amMbd8Sg1r@b~^ybQS%SD~AhO2Y ze`8}-O!6ps|J>huWOT3Z8GgUM@rJX$r~i^d5RX=vd}+58yFBkyo;s9~lg3b2AX1s< zrr;3UfrG`)z?JLbF4Io|6SJAdqc0W}bFG5ai7C{8g(~O9!`SGuk&Pp%=RLPZ9va!4 z;5_&%zd2869tQeVRFK^Utd)-B#iw!WJF?dZd1i3Vv(81b^)GdE5zL`HT1JsPFL@AI;!8AWCBPMIavC+klSw)Tx%P_B%%$u&jhg#^E+_KcM; z&-cp%q-wt236Us9CEn(1leb80ncflZ@oL3Ir(3}L36oErVnxN5C5uuQ6CE9$tkck4 zNvdjUX=+J&2%5rTnST3ua=VAzVKjW287@#xI%+X#G2^oEPGxFaJl==l(Cu3V{fDE6 zWqW}E&P%#ebJB7`-2pSyjPZCI0^m>m6tG2H@ux1fKJ(pcU1})biAMu4d*Lq!are^~*o z)tR&>FgspIer{WLJlM5nUvIr?R2ijJ9gtIaXv!vOJTPx8e-!I6C411MLf-743Xr$7 zI>j;U6W8&B_21DRES7HXL#QvzPhU{>nPZ!HtlJ+QvX=inssAh+Q>&nfrO zV9L?H(V=9bpe>%MKKq8a53BPy;PzGR6T9IS`6d2I^;DU+=G;mV`WC@DU}UR?@mnS( z=GN;m*HqZ#YO+n1o*Nt48+Q}PxG7hCeQ0uzO(L+?#Bo(@Hs!{RJiPS z4SiPBlrl~r{PO3%bWLN~K?nPEC-3ujpX8=*3^+Vt{OdLWu3?px-$7&01qV7Q10tS4 za32M4nBlB$PUd=LuSKoWHg#O1%tYRAwAOC3j@O(LgtWn$kl{C-U+S)AimO=a`I^cL zFXDYwwy(Mp(oaO5UmbQ^qrV*I+?n>>-YdV_Odus+ZKZI`ge@Tp(E^w2n01UEzb&6ta{g;b zPgQ&9?GoqG16P$5rWv3zU}wHPCFdl`P}{sn<(b7+xkdNiG|aj!O)0Fp1?`CU8Unl} zP7$#zsBRs-Lo3s}yA$0DBd^D7QLk~*!SH=xm<;wl2!7YwA)wFx>5RbA>ND1Uc9V!G zw!zU)>OE2MQ@l^3s8hgo<7>taRjt#Mh+$ zrqWwUGjzmI(P6Qw1m%UX0|{=}T~~qzcSC4mi1pg)ywbbl@xp7alQ;TA(_ikmJnUK^ zWK<;|rJx5)^*W5TG&M1n*HYv>SVJ)tEeUxpx2s|ZR==13v(6f+cPUio1X_53X8 zr-wVL{Vd3_;H;NCGD;l-8V4bwpjZ$L1dB4kf*w;N;7}+U4v*@=f-e5oSjK`PSV(tS z=+6PMg@Au8uuvo%8Wo8Hi2|fM@xNnGC=P-6-3LREF73bJU?@23cOQuY<_{kd`X>&F z#{I$p|4#}EM`L~`3WekTB#1;q(Z4rAVvv83M!^w(G)AG}|H=h^ZVH7aJwg1oI}{H3 z$Bs#_6n`|qLP;+Q|IS7HtoWM`34>#QCxb>~5jTEsf`wxKV2y=hk*KI=Vjwv%4v7Hs K@W`s&1^)-YG68D< delta 4369 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