Merge pull request #5816 from unisonweb/25-07-14-update

Unify normal slurp output with update-branch slurp output

Author: aryairani

lib/unison-prelude/src/Unison/Util/Map.hs

@@ -12,6 +12,7 @@ module Unison.Util.Map
     for_,
     insertLookup,
     invert,
+    lookupJust,
     mergeMap,
     unionWithM,
     remap,
@@ -83,6 +84,11 @@ invert :: (Ord v) => Map k v -> Map v k
 invert =
   Map.foldlWithKey' (\m k v -> Map.insert v k m) Map.empty
 
+-- | Like 'Map.lookup', but asserts the key is in the map.
+lookupJust :: (Ord k, Show k) => k -> Map k v -> v
+lookupJust k =
+  Map.findWithDefault (error (reportBug "E147567" ("Missing key: " ++ show k))) k
+
 -- | Upsert an element into a map.
 upsert :: (Ord k) => (Maybe v -> v) -> k -> Map k v -> Map k v
 upsert f =

parser-typechecker/src/Unison/Codebase.hs

@@ -14,6 +14,7 @@ module Unison.Codebase
     unsafeGetTermComponent,
     getTypeOfTerm,
     expectTypeOfTerm,
+    expectTypeOfConstructor,
     getDeclType,
     unsafeGetTypeOfTermById,
     isTerm,
@@ -145,6 +146,7 @@ import Unison.Codebase.SqliteCodebase.Operations qualified as SqliteCodebase.Ope
 import Unison.Codebase.Type (Codebase (..))
 import Unison.CodebasePath (CodebasePath, getCodebaseDir)
 import Unison.ConstructorReference (ConstructorReference, GConstructorReference (..))
+import Unison.ConstructorReference qualified as ConstructorReference
 import Unison.Core.Project (ProjectAndBranch)
 import Unison.DataDeclaration (Decl)
 import Unison.DataDeclaration qualified as DD
@@ -359,6 +361,17 @@ getTypeOfConstructor codebase (ConstructorReference r0 cid) =
         Just decl -> DD.typeOfConstructor (either DD.toDataDecl id decl) cid
     Reference.Builtin _ -> error (reportBug "924628772" "Attempt to load a type declaration which is a builtin!")
 
+expectTypeOfConstructor ::
+  (Ord v) =>
+  Codebase m v a ->
+  ConstructorReference ->
+  Sqlite.Transaction (Type v a)
+expectTypeOfConstructor codebase ref =
+  getTypeOfConstructor codebase ref <&> fromMaybe err
+  where
+    err =
+      error (reportBug "E775974" ("constructor reference " ++ Text.unpack (ConstructorReference.toText ref) ++ " not found"))
+
 -- | Like 'getWatch', but first looks up the given reference as a regular watch, then as a test watch.
 --
 -- @
@@ -435,7 +448,7 @@ typeLookupForDependencies codebase s = do
 getTypeOfTerm ::
   (BuiltinAnnotation a) =>
   Codebase m Symbol a ->
-  Reference ->
+  TermReference ->
   Sqlite.Transaction (Maybe (Type Symbol a))
 getTypeOfTerm _c r | debug && trace ("Codebase.getTypeOfTerm " ++ show r) False = undefined
 getTypeOfTerm c r = case r of
@@ -448,7 +461,7 @@ getTypeOfTerm c r = case r of
 expectTypeOfTerm ::
   (BuiltinAnnotation a) =>
   Codebase m Symbol a ->
-  Reference ->
+  TermReference ->
   Sqlite.Transaction (Type Symbol a)
 expectTypeOfTerm codebase ref =
   getTypeOfTerm codebase ref <&> fromMaybe err

parser-typechecker/src/Unison/Syntax/NamePrinter.hs

@@ -16,7 +16,7 @@ import Unison.Referent (Referent)
 import Unison.ShortHash (ShortHash)
 import Unison.ShortHash qualified as SH
 import Unison.Syntax.HashQualified qualified as HQ (toText)
-import Unison.Syntax.Name qualified as Name (toText)
+import Unison.Syntax.Name qualified as Name (toText, toTextParens)
 import Unison.Util.Pretty (Pretty)
 import Unison.Util.Pretty qualified as PP
 import Unison.Util.SyntaxText qualified as S
@@ -26,6 +26,9 @@ type SyntaxText = S.SyntaxText' Reference
 prettyName :: (IsString s) => Name -> Pretty s
 prettyName = PP.text . Name.toText
 
+prettyNameParens :: (IsString s) => Name -> Pretty s
+prettyNameParens = PP.text . Name.toTextParens
+
 prettyHashQualified :: HQ.HashQualified Name -> Pretty SyntaxText
 prettyHashQualified hq = styleHashQualified' id (fmt $ S.HashQualifier hq) hq
 

unison-cli-integration/integration-tests/IntegrationTests/transcript.output.md

@@ -38,15 +38,13 @@ main = do
 ``` ucm :added-by-ucm
   Loading changes detected in scratch.u.
 
-  I found and typechecked these definitions in scratch.u. If you
-  do an `update`, here's how your codebase would change:
-
-    ⍟ New definitions:
-    
-      structural ability Break
-      type MyBool
-      main   : '{IO, Exception} ()
-      resume : Request {g, Break} x -> x
+  + structural ability Break
+  + type MyBool
+
+  + main   : '{IO, Exception} ()
+  + resume : Request {g, Break} x -> x
+
+  Run `update` to apply these changes to your codebase.
 ```
 
 ``` ucm

unison-cli/src/Unison/Codebase/Editor/HandleInput/AddRun.hs

@@ -6,7 +6,6 @@ where
 import Control.Lens (use)
 import Control.Monad.Reader (ask)
 import Data.Map.Strict qualified as Map
-import Data.Set qualified as Set
 import Data.Text qualified as Text
 import Unison.Cli.Monad (Cli)
 import Unison.Cli.Monad qualified as Cli
@@ -47,7 +46,7 @@ handleAddRun input resultName = do
           (UF.watchComponents uf0)
   Cli.Env {codebase} <- ask
   currentNames <- Cli.currentNames
-  let sr = Slurp.slurpFile uf (Set.singleton resultVar) Slurp.AddOp currentNames
+  let sr = Slurp.slurpFile uf resultVar currentNames
   let adds = SlurpResult.adds sr
   Cli.runTransaction . Codebase.addDefsToCodebase codebase . SlurpResult.filterUnisonFile sr $ uf
   let description = (Text.pack (InputPattern.patternName InputPatterns.saveExecuteResult) <> " " <> Name.toText resultName)