@@ -40,6 +40,7 @@ import U.Codebase.Branch (NamespaceStats (..))
4040import U.Codebase.Branch.Diff (NameChanges (.. ))
4141import U.Codebase.HashTags (CausalHash (.. ))
4242import U.Codebase.Reference qualified as Reference
43+ import U.Codebase.Sqlite.HistoryComment (HistoryComment (.. ))
4344import U.Codebase.Sqlite.Project (Project (.. ))
4445import U.Codebase.Sqlite.ProjectBranch (ProjectBranch (.. ))
4546import U.Codebase.Sqlite.ProjectReflog qualified as ProjectReflog
@@ -163,7 +164,6 @@ import Unison.Var (Var)
163164import Unison.Var qualified as Var
164165import Unison.WatchKind qualified as WK
165166import Witch (unsafeFrom )
166- import U.Codebase.Sqlite.HistoryComment (HistoryComment (.. ))
167167
168168reportBugURL :: Pretty
169169reportBugURL = " https://github.com/unisonweb/unison/issues/new"
@@ -305,13 +305,12 @@ notifyNumbered = \case
305305 displayComment :: Bool -> Maybe (HistoryComment () ) -> [Pretty ]
306306 displayComment prefixSpacer mayComment = case mayComment of
307307 Nothing -> []
308- Just (HistoryComment {author, subject, content}) ->
308+ Just (HistoryComment {author, subject, content}) ->
309309 Monoid. whenM prefixSpacer [" " ]
310- <> [
311- P. bold (P. text author),
312- P. indent (P. blue (P. text " > " )) (P. yellow $ P. text subject),
313- P. indent (P. blue (P. text " > " )) (P. text content),
314- " "
310+ <> [ P. bold (P. text author),
311+ P. indent (P. blue (P. text " > " )) (P. yellow $ P. text subject),
312+ P. indent (P. blue (P. text " > " )) (P. text content),
313+ " "
315314 ]
316315 handleTail :: Int -> (Pretty , [CausalHash ])
317316 handleTail n = case tail of
@@ -914,19 +913,20 @@ notifyUser dir issueFn = \case
914913 -- defs in the codebase. In some cases it's fine for bindings to
915914 -- shadow codebase names, but you don't want it to capture them in
916915 -- the decompiled output.
916+
917917 let prettyBindings =
918918 P. bracket . P. lines $
919919 P. wrap " The watch expression(s) reference these definitions:"
920920 : " "
921921 : [ P. syntaxToColor $ TermPrinter. prettyBinding ppe (HQ. unsafeFromVar v) b
922- | (v, b) <- bindings
922+ | (v, b) <- bindings
923923 ]
924924 prettyWatches =
925925 P. sep
926926 " \n\n "
927927 [ watchPrinter fileContents ppe ann kind evald isCacheHit
928- | (ann, kind, evald, isCacheHit) <-
929- sortOn (\ (a, _, _, _) -> a) . toList $ watches
928+ | (ann, kind, evald, isCacheHit) <-
929+ sortOn (\ (a, _, _, _) -> a) . toList $ watches
930930 ]
931931 in -- todo: use P.nonempty
932932 pure $
@@ -3584,13 +3584,13 @@ listOfDefinitions' fscope ppe detailed results =
35843584 -- where sigs0 = (\(name, _, typ) -> (name, typ)) <$> terms
35853585 termsWithMissingTypes =
35863586 [ (name, Reference. idToShortHash r)
3587- | SR'. Tm name Nothing (Referent. Ref (Reference. DerivedId r)) _ <- results
3587+ | SR'. Tm name Nothing (Referent. Ref (Reference. DerivedId r)) _ <- results
35883588 ]
35893589 missingTypes =
35903590 nubOrdOn snd $
35913591 [(name, r) | SR'. Tp name (MissingObject r) _ _ <- results]
35923592 <> [ (name, Reference. toShortHash r)
3593- | SR'. Tm name Nothing (Referent. toTypeReference -> Just r) _ <- results
3593+ | SR'. Tm name Nothing (Referent. toTypeReference -> Just r) _ <- results
35943594 ]
35953595 missingBuiltins =
35963596 results >>= \ case
@@ -3744,7 +3744,7 @@ prettyDiff diff =
37443744 P. column2 $
37453745 (P. hiBlack " Original name" , P. hiBlack " New name(s)" )
37463746 : [ (prettyName n, P. sep " " (prettyName <$> ns))
3747- | (n, ns) <- copied
3747+ | (n, ns) <- copied
37483748 ]
37493749 ]
37503750 else mempty
0 commit comments