From 7cb8935ff5061379cbbcee1a616ade75f59a1f70 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Sun, 20 Mar 2022 08:54:20 -0600 Subject: [PATCH 1/2] Pass project entry id to Pane when opening a project items This fixes an oversight where we were failing to associate project items with their project entry ids, which broke the logic that prevented the same project entry from being opened twice in the same pane. --- crates/workspace/src/workspace.rs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs index 33155b5d4f4710338d6c4d4570af129f21e92624..9b9477353b5a93fe148269153695023be50f0b9e 100644 --- a/crates/workspace/src/workspace.rs +++ b/crates/workspace/src/workspace.rs @@ -862,10 +862,9 @@ impl Workspace { { use project::Item as _; - if let Some(item) = project_item - .read(cx) - .entry_id(cx) - .and_then(|entry_id| self.active_pane().read(cx).item_for_entry(entry_id)) + let entry_id = project_item.read(cx).entry_id(cx); + if let Some(item) = entry_id + .and_then(|entry_id| self.active_pane().read(cx).item_for_entry(dbg!(entry_id))) .and_then(|item| item.downcast()) { self.activate_item(&item, cx); @@ -873,7 +872,9 @@ impl Workspace { } let item = cx.add_view(|cx| T::for_project_item(self.project().clone(), project_item, cx)); - self.add_item(Box::new(item.clone()), cx); + self.active_pane().update(cx, |pane, cx| { + pane.add_item(entry_id, Box::new(item.clone()), cx) + }); item } From 1c23a45d02ea16f1a780f2bd68f319cc6d0188ad Mon Sep 17 00:00:00 2001 From: Nate Butler Date: Mon, 21 Mar 2022 12:11:31 -0400 Subject: [PATCH 2/2] Update Zed fonts to 1.2.1 --- .../fonts/zed-mono/zed-mono-extended.ttf | Bin 3291724 -> 3291724 bytes .../fonts/zed-mono/zed-mono-extendedbold.ttf | Bin 3275296 -> 3275296 bytes .../zed-mono/zed-mono-extendedbolditalic.ttf | Bin 3459752 -> 3459752 bytes .../zed-mono/zed-mono-extendeditalic.ttf | Bin 3482500 -> 3482500 bytes .../fonts/zed-sans/zed-sans-extended.ttf | Bin 3881072 -> 3881072 bytes .../fonts/zed-sans/zed-sans-extendedbold.ttf | Bin 3861168 -> 3861168 bytes .../zed-sans/zed-sans-extendedbolditalic.ttf | Bin 4133220 -> 4133220 bytes .../zed-sans/zed-sans-extendeditalic.ttf | Bin 4143104 -> 4143104 bytes 8 files changed, 0 insertions(+), 0 deletions(-) diff --git a/crates/zed/assets/fonts/zed-mono/zed-mono-extended.ttf b/crates/zed/assets/fonts/zed-mono/zed-mono-extended.ttf index 1cab6121aad689ef98ac7f79b408108d15b87e68..05b8c7085e51d4321bf1e73f763980629c8ddfd0 100644 GIT binary patch delta 507 zcmYMxODIH99LMo<&&A9&USqDuxOY77Fve@sJ+(-_qludx)3rD`lqV-}5B z51HV&wJF9YZKSUvl{=y*w}M-W83FE#?-OZJm=MDt0d&ml=?F~YyGP z^mWzeT(v87m<+%-#2}y_pZZQ+LIV3GScq;P_-mr~dw#31fHvom_=8W6Klsm@d4(wY hnp2%Gm3v>GXGgQ!KS&Axf-fU?wV{o_HR@|sSBnhIT-Z zoS`9-E^-r-Ft~$>#6UyJVzCIT`g?ZxL|Z zo0(MyC6lz?JR<50qLH;fzDrtGqodjb|<-&P#C4hV9DGk@ z@{w`UY;y`qJna$^!lTUk27V^~^HBKJV}m@%hXN=BI}|}Nlz4H1ypcC z6;wkF)IuG&pdQ@N0FBTD&Bm+8vu05;&+huZ-Pr#(bcdsw2fWY%t5zf6*ldXw2AjXrUT4GHrjE XD(ru!YVjE>qkHF*{8wYXUQPW3ey6tq diff --git a/crates/zed/assets/fonts/zed-mono/zed-mono-extendedbold.ttf b/crates/zed/assets/fonts/zed-mono/zed-mono-extendedbold.ttf index 5c027864e01d3346cc84847db83e022d1fcf320c..d5dde1bb14d5809c4c3312f53903adc7bece6b52 100644 GIT binary patch delta 526 zcmYMx&npCB9LMozo>|sdzn1ZH#v0c8{bQ&6Sdm|){5YT_2dxyfDWQ<7*0fjlvKO)H zQCl2bm_NW_aOkP$2XbAIE_(_@fx#fEJb6f8nbIG?UV`j zxI;1DsgFL2RPK(P#RZQPGyOD^9~NoJDj}vxMod3>^=JRx7urkKLLJmY12jUD zzL#v?+;u8+iVVUN#9&1C2EFH{f`RWKY(;XG)%wWjf|@35p{;qyci`212ddG|D@4)h tjha+^hbK!bGud6Qq>O*SbCKJI#j(HrbL`8JGG#j^eV9RmLNM60oy12M67DKyZy)IgC8MG+bZ1tEh&2N!9M ztRYLlhBU$>gXj`yZt3O_+)Q;5N|g*jy9re)LeqazYaaY~@Bi@)?|m=-t1RRp6`zTR zf0s!*JSNX{J{Dblr$#Jeq}`km(QFI_Q|ZlT}usbV@a_N3reBx5{g1qX7expb=>Ed$+T*P4tNNi&;>TILpMAE8G4`> z`rtA2!vH9tf&&I&2%InsBj5rzcwiL9;E9n|$1e|*)|36sn+5Mj5J=`~<1hhUn1rV= zW#nqpn^}99Md%g$gpCHn_tCfSkP0|ABr>+R=FPl*uUVwTU9FG|Z2OGBwpR9wVG0`T tM5{Ri7tgkiR=S>F(U5qK@1h@$YUuxdyZFc27BTG-21ks9MjflU{{;ayu diff --git a/crates/zed/assets/fonts/zed-mono/zed-mono-extendedbolditalic.ttf b/crates/zed/assets/fonts/zed-mono/zed-mono-extendedbolditalic.ttf index 47a3a9bc27d1f4be40eb1795f523a3f184027e8c..bcd8c7e618e0b684e236a728c85860308b5ad386 100644 GIT binary patch delta 505 zcmX}pIY425*+h-EalMi?n!{)`#v_YY>^-nCSj56ez#|CaDjKW;f@?s6*hoM~ zH-(C=Y#~;5mf8q{g(RR>X;e^f{9MrD;pZI&hMze(x)V;|P*oZdg%GjiW=Q+%d3-Up zAn!YdiEz2}v+U){ zd4Ye>b^0Pvc_A~9x3t-^JWA)pNr~Ey3E`Z7@u+ZVbZRSa(YNxYXEA$@+|oYrP@=>4 zzn6$gZiOqOAM}y2GM`}2a<}j*JV`XPX58?h6Gm^OlH+Ai4i!)dRZtBzV1-(cpbqMx z0UDtRY+wf&n!y1r&&FItiNPz`}yC?DesCO zx*-5P&MdYs&X)7 l!gHUx<5USd<=M@9>wMMd8)*@r@nPiAzdHRlGwB;e{sGwsx&r_J delta 505 zcmYk(O(;ZB6bJBg@0-Ch#>aRV<_(51jBn;8UmGh%RY`?h_ehfpmyd`{lY(Z9{a87zYm?_F+9oEE!nogf8fY z9_WQWBe2px_2MEok5D&{FbOpZL1S+^bmO&OqEBb05}^_MD%x-|l?WNBgmy4!BR4sX h`ZI0XrygH_kIt8keo}+Q&A{RKQCrxO4G diff --git a/crates/zed/assets/fonts/zed-mono/zed-mono-extendeditalic.ttf b/crates/zed/assets/fonts/zed-mono/zed-mono-extendeditalic.ttf index 85ff2c3c4ae8e54881c262de18a0f457685481f5..023c5a87cea6c1ba98238367e162d1de1003397c 100644 GIT binary patch delta 503 zcmX}p%PT}t90%}o&Na9m<8{4e?ih^6U>JN@|e`1p~z0TW~0n*N=oXi zuo7-8C>9!avQWx`g|RXvY}D~}i^Zqk?|b?!&adC<)g4`h=v5kn3=S{kXzOuMHSX{ zZw@VzTY75d2cvf=vyR%gg^NDZCxvy-niF2+c{7J2Yg#5`K{i++2XY|~@}U3}D1;&? zh7u?R8`wbw2b6&m%Ao=(!39-N4K+{;Zm5HLXfW0^k34Os*uLM~e)9L1;`={OMRqSd z&v9KjTuog#Z8m delta 503 zcmYMxKS*0q6bA5f?=#lt->NUROwxi+U8V5<;#7SsNb#bVerGj*Letl3Jew_1N&T!AY8^>pC19D5le?Rjb zQg3!CIFe1yz5k$3*G^H)|AvTOCUH=8V%{PnQXsjQUKz{2`n4{FWI}Qw6(OsHbO~84 zg_t*G``IzO(D>-GGck$$$;s)=rdbE|&;X6l1dpK^ zTA&p)a6=nBfv4~cJm3W#e9#UCJckZ=0e%QTCv-tK1R(@H&}(g)VRga#u>CvdmL4K@ z?Yu@jvtJ5BAM`^624K+IFAY_$TFBrgMY+k`s0oNzU%y0;e6Aw;d?8(qj=EB4Co>1- rsC7^t-X2j5@>p+qthz(r+7qjZrm;U{C|Cdf>xb`h=6@|D{W1L>^whA9 diff --git a/crates/zed/assets/fonts/zed-sans/zed-sans-extended.ttf b/crates/zed/assets/fonts/zed-sans/zed-sans-extended.ttf index d5cc91e27aaee686ea84ed9fcb99634c16c156b5..07a968568039987f2ba5b64de12a5ce1016a0054 100644 GIT binary patch delta 251 zcmXwt$xQ+Q004Jc@K(I=LO?DLK=EF@5)&Gr18T4Yl9|6vXa^KvBffq3*pDw0<6`0@ zlSw8?KEovSc@zzsuOlRsj6{-^oJ`5I%*d?F$-FGcqAW>XmSsg&Wlh$lARDqNTe2-X zQj}dONm(kgCsnCQT^iDqeL0XrIg*yNr6b33B3(I^GdY(Fxs)rpmRNdnBe!Gj#&P`6 keH-TQzk*8i5v06#o}&ML4}MCye)c7JOiv~VCqLz{zooNSn*aa+ delta 251 zcmXwtIZgrr004Jc5HAE3Z&y(8zR&fbAn*Zd8=hfJGSmABpTHCRhNZEv*v86)xSBZ0 zWRgkK&oIq=9z>l=bAW`BlSuMXkTEIBxJ<~TOv$vAWJbzTky)9Od8x{REXtBB%ZjYZ znygDK8&Z?HY|552q$%67BfGLE`*I+MawNxcBBydD=W-#JawXStBZ=I~o!k$37$(Wn k<7>a%`U+~%N09Lrzjyxo-5bS)ZvG``XD1hgzdz%zKR=*Zng9R* diff --git a/crates/zed/assets/fonts/zed-sans/zed-sans-extendedbold.ttf b/crates/zed/assets/fonts/zed-sans/zed-sans-extendedbold.ttf index 0e1264b1ceedf72417968c21d2dd0c7b2f1176ea..696c3cdd5b8ecde7cf574ec8491c15094b3bb4fa 100644 GIT binary patch delta 249 zcmXwtyDmck06_2UZ7D@5^(bvAeW2d25=-L;npkYU!Qca$oU{85F?8`M221CPNx~!% zm!u~-Imzk0yobHmhi-IVeeEKlBqWlgq+~=!B`sqzE*Y7SNtu$YOv{YqWLD-RFY~e> zi?SpIS(X(kN=eGHDr-`ab=i=r)TAyA*_18WmZt2;uI$Oa9LS*@$+4Wsshmkm&Y!vX pd}}>^TwUL0FTa9vGzen)&AZC5-<_XK>L&RVwBwTq!oMH$-(Sw&StkGh delta 249 zcmXwtIZgrr004Jc5D^6r@Z?bO0z}0Vjg225lyv^VACS!S{=rfU8lPfoXQHvy%7nO> zILTy^8NPgm!`S;l)X%jCNGJ)3Bq=GGkhDxnMy4by(=sDD$;+(F$-FE`L5i{{OR_90 zvMOs*lCo5!D(kW#n^Kc4*_IvIl|89TLz=QLEjf@wIg+*<%ZZ%InVidobma1xtFMpF nWApCeHh=vcRHOGG=C%CR{qIk2luh-MPr*%m5@32{{TViT5$jX delta 240 zcmXxVIZi?W002?&t0*q;T~IdJ-1h}s5dAG@FeIFSf+LX3^mg`i9)Rmu5kq5XXN)vX z@-pM$PkcP}ItY4Ue}KegMgp0YIhmJ)EXblHWl5H0MOGyxX$fUb)@4IBB_mt1Em_G) zUJ6o_9Vtm!DpHl2?8=_(%YhuqksQm3oXVM;%Y|IZm0Zh>)TJS}awqrlAWeCcmORPx ei0D0?@4WnWQ?2h@CBUwi)W5rJZX%piIYqw zna=xH*h%blqldd4HScTx{VaZ$GSBIkpq-pl5dQvzzy1Iu|6Q>F delta 263 zcmXwt$u2_y007_XYb{k;TPdE}ccr#xDH4fKaP}*0GIJG)k7%5n{DZIPQ5;=*s)$Eo zlF1~~{QL@=sgJGbuJqPILdi%ZS;yvTPUTF_A sDOayt-zLe+bML;`=myp3BS`7Q?@#~jmA~WML$)2