From d732e5a91ad822810b77e830e29a0e8d3311320e Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Fri, 28 Apr 2023 16:47:51 -0400 Subject: [PATCH] vats: hack to always render multi-line tanks --- pkg/arvo/gen/vats.hoon | 1 + pkg/base-dev/sur/hood.hoon | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/pkg/arvo/gen/vats.hoon b/pkg/arvo/gen/vats.hoon index 5fdfaec745..061df9516b 100644 --- a/pkg/arvo/gen/vats.hoon +++ b/pkg/arvo/gen/vats.hoon @@ -15,6 +15,7 @@ |= [[now=@da * bec=beak] deks=$@(~ (list desk)) filt=@tas verb=_|] ?: &(=(~ deks) =(%$ filt)) :- %tang + %- zing %+ turn %+ sort ~(tap in .^((set desk) %cd /(scot %p p.bec)/base/(scot %da now))) diff --git a/pkg/base-dev/sur/hood.hoon b/pkg/base-dev/sur/hood.hoon index 28883c8a67..bbe55e4e1a 100644 --- a/pkg/base-dev/sur/hood.hoon +++ b/pkg/base-dev/sur/hood.hoon @@ -40,10 +40,12 @@ :: ++ report-vats |= [our=@p now=@da desks=(list desk) filt=@tas verb=?] + ^- tang =/ ego (scot %p our) =/ wen (scot %da now) =/ prep (report-prep our now) ?~ filt + %- zing %+ turn (flop desks) |=(syd=@tas (report-vat prep our now syd verb)) =/ deks @@ -66,8 +68,11 @@ |=([syd=desk *] syd) ?~ blockers ~[leaf+"No desks blocking upgrade, run |bump to apply"] :- [%rose [" %" "To unblock upgrade run |suspend %" ""] blockers] + %- zing %+ turn (flop blockers) |=(syd=desk (report-vat prep our now syd verb)) + :: + %- zing %+ turn ?+ filt !! :: @@ -100,6 +105,15 @@ == our=ship now=@da syd=desk verb=? == + ^- tang + =- :: hack to force wrapped rendering + :: + :: edg=6 empirically prevents dedent + :: + %+ roll + (~(win re -) [0 6]) + |=([a=tape b=(list @t)] [(crip a) b]) + :: ^- tank =/ ego (scot %p our) =/ wen (scot %da now)