diff --git a/unison-cli-integration/integration-tests/IntegrationTests/transcript.output.md b/unison-cli-integration/integration-tests/IntegrationTests/transcript.output.md index 09def1616..2cf4f325c 100644 --- a/unison-cli-integration/integration-tests/IntegrationTests/transcript.output.md +++ b/unison-cli-integration/integration-tests/IntegrationTests/transcript.output.md @@ -27,7 +27,7 @@ main = do _ -> () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -43,7 +43,7 @@ main = do resume : Request {g, Break} x -> x ``` -```ucm +``` ucm .> add ⍟ I've added these definitions: diff --git a/unison-cli/src/Unison/Codebase/TranscriptParser.hs b/unison-cli/src/Unison/Codebase/TranscriptParser.hs index ebabe7b4d..bf71f18a8 100644 --- a/unison-cli/src/Unison/Codebase/TranscriptParser.hs +++ b/unison-cli/src/Unison/Codebase/TranscriptParser.hs @@ -423,14 +423,14 @@ run verbosity dir stanzas codebase runtime sbRuntime nRuntime config ucmVersion liftIO (writeIORef allowErrors errOk) -- Open a ucm block which will contain the output from UCM -- after processing the UnisonFileChanged event. - liftIO (output "```ucm\n") + liftIO (output "``` ucm\n") -- Close the ucm block after processing the UnisonFileChanged event. atomically . Q.enqueue cmdQueue $ Nothing let sourceName = fromMaybe "scratch.u" filename liftIO $ updateVirtualFile sourceName txt pure $ Left (UnisonFileChanged sourceName txt) API apiRequests -> do - liftIO (output "```api\n") + liftIO (output "``` api\n") liftIO (for_ apiRequests apiRequest) liftIO (output "```") awaitInput @@ -438,7 +438,7 @@ run verbosity dir stanzas codebase runtime sbRuntime nRuntime config ucmVersion liftIO (writeIORef hidden hide) liftIO (writeIORef allowErrors errOk) liftIO (writeIORef hasErrors False) - liftIO (output "```ucm") + liftIO (output "``` ucm") traverse_ (atomically . Q.enqueue cmdQueue . Just) cmds atomically . Q.enqueue cmdQueue $ Nothing awaitInput diff --git a/unison-src/transcripts-manual/docs.to-html.output.md b/unison-src/transcripts-manual/docs.to-html.output.md index e59537da2..5c938806b 100644 --- a/unison-src/transcripts-manual/docs.to-html.output.md +++ b/unison-src/transcripts-manual/docs.to-html.output.md @@ -1,4 +1,4 @@ -```ucm +``` ucm test-html-docs/main> builtins.mergeio lib.builtins Done. @@ -15,7 +15,7 @@ some.ns.pretty.deeply.nested = 2 some.outside = 3 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -33,7 +33,7 @@ some.outside = 3 some.outside.doc : Doc2 ``` -```ucm +``` ucm test-html-docs/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts-manual/rewrites.output.md b/unison-src/transcripts-manual/rewrites.output.md index 91d1272ec..26cd59b49 100644 --- a/unison-src/transcripts-manual/rewrites.output.md +++ b/unison-src/transcripts-manual/rewrites.output.md @@ -29,7 +29,7 @@ rule2 x = @rewrite signature Optional ==> Optional2 Let's rewrite these: -```ucm +``` ucm scratch/main> rewrite rule1 ☝️ @@ -110,7 +110,7 @@ rule2 x = @rewrite signature Optional ==> Optional2 After adding to the codebase, here's the rewritten source: -```ucm +``` ucm scratch/main> view ex1 Either.mapRight rule1 Either.mapRight : (a ->{g} b) -> Optional a ->{g} Optional b @@ -156,7 +156,7 @@ blah2 = 456 Let's apply the rewrite `woot1to2`: -```ucm +``` ucm scratch/main> rewrite woot1to2 ☝️ @@ -192,7 +192,7 @@ blah2 = 456 After adding the rewritten form to the codebase, here's the rewritten `Woot1` to `Woot2`: -```ucm +``` ucm scratch/main> view wootEx wootEx : Nat ->{Woot2} Nat @@ -224,7 +224,7 @@ sameFileEx = After adding the rewritten form to the codebase, here's the rewritten definitions: -```ucm +``` ucm scratch/main> view foo1 foo2 sameFileEx foo1 : Nat @@ -265,7 +265,7 @@ sameFileEx = In the above example, `bar2` is locally bound by the rule, so when applied, it should not refer to the `bar2` top level binding. -```ucm +``` ucm scratch/main> rewrite rule ☝️ @@ -299,7 +299,7 @@ sameFileEx = Instead, it should be an unbound free variable, which doesn't typecheck: -```ucm +``` ucm scratch/main> load Loading changes detected in scratch.u. @@ -330,7 +330,7 @@ rule a = @rewrite term 233 ==> a ``` -```ucm +``` ucm scratch/main> rewrite rule ☝️ @@ -356,7 +356,7 @@ rule a = The `a` introduced will be freshened to not capture the `a` in scope, so it remains as an unbound variable and is a type error: -```ucm +``` ucm scratch/main> load Loading changes detected in scratch.u. @@ -386,7 +386,7 @@ findEitherEx x = @rewrite term Left ("hello", x) ==> Left ("hello" Text.++ x) findEitherFailure = @rewrite signature a . Either Failure a ==> () ``` -```ucm +``` ucm scratch/main> sfind findEitherEx 🔎 diff --git a/unison-src/transcripts-round-trip/main.output.md b/unison-src/transcripts-round-trip/main.output.md index 05d85375e..5230f3495 100644 --- a/unison-src/transcripts-round-trip/main.output.md +++ b/unison-src/transcripts-round-trip/main.output.md @@ -4,7 +4,7 @@ This transcript verifies that the pretty-printer produces code that can be succe x = () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -19,7 +19,7 @@ x = () ``` So we can see the pretty-printed output: -```ucm +``` ucm .a1> edit 1-1000 ☝️ @@ -770,7 +770,7 @@ a |> f = f a This diff should be empty if the two namespaces are equivalent. If it's nonempty, the diff will show us the hashes that differ. -```ucm +``` ucm .> diff.namespace a1 a2 The namespaces are identical. @@ -784,7 +784,7 @@ This just makes 'roundtrip.u' the latest scratch file. x = () ``` -```ucm +``` ucm .a3> edit 1-5000 ☝️ @@ -819,7 +819,7 @@ sloppyDocEval = These are currently all expected to have different hashes on round trip. -```ucm +``` ucm .> diff.namespace a3 a3_old Updates: diff --git a/unison-src/transcripts-using-base/_base.output.md b/unison-src/transcripts-using-base/_base.output.md index ef2da4b88..eaad4fb38 100644 --- a/unison-src/transcripts-using-base/_base.output.md +++ b/unison-src/transcripts-using-base/_base.output.md @@ -39,7 +39,7 @@ testAutoClean _ = Left (Failure _ t _) -> results :+ (Fail t) ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -52,7 +52,7 @@ testAutoClean _ = testAutoClean : '{IO} [Result] ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts-using-base/all-base-hashes.output.md b/unison-src/transcripts-using-base/all-base-hashes.output.md index 99d4128d0..0b656ef0c 100644 --- a/unison-src/transcripts-using-base/all-base-hashes.output.md +++ b/unison-src/transcripts-using-base/all-base-hashes.output.md @@ -1,6 +1,6 @@ This transcript is intended to make visible accidental changes to the hashing algorithm. -```ucm +``` ucm scratch/main> find.verbose 1. -- #sgesq8035ut22q779pl1g4gqsg8c81894jjonmrq1bjltphkath225up841hk8dku59tnnc4laj9nggbofamgei4klof0ldc20uj2oo diff --git a/unison-src/transcripts-using-base/binary-encoding-nats.output.md b/unison-src/transcripts-using-base/binary-encoding-nats.output.md index 5f4b4c889..da9bc7a95 100644 --- a/unison-src/transcripts-using-base/binary-encoding-nats.output.md +++ b/unison-src/transcripts-using-base/binary-encoding-nats.output.md @@ -53,7 +53,7 @@ testABunchOfNats _ = (runTest (testNat 0)) ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -75,7 +75,7 @@ testABunchOfNats _ = testRoundTrip : Nat -> EncDec ->{IO, Stream Result} () ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts-using-base/codeops.output.md b/unison-src/transcripts-using-base/codeops.output.md index 4a4671c53..6e51f371d 100644 --- a/unison-src/transcripts-using-base/codeops.output.md +++ b/unison-src/transcripts-using-base/codeops.output.md @@ -151,7 +151,7 @@ swapped name link = rejected ("swapped " ++ name) rco ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -198,7 +198,7 @@ swapped name link = ->{Throw Text} () ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -315,7 +315,7 @@ badLoad _ = Left _ -> [Fail "Exception"] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -342,7 +342,7 @@ This simply runs some functions to make sure there isn't a crash. Once we gain the ability to capture output in a transcript, it can be modified to actual show that the serialization works. -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -428,7 +428,7 @@ codeTests = ] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -441,7 +441,7 @@ codeTests = codeTests : '{IO} [Result] ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -514,7 +514,7 @@ vtests _ = ] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -528,7 +528,7 @@ vtests _ = vtests : '{IO} [Result] ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts-using-base/doc.output.md b/unison-src/transcripts-using-base/doc.output.md index 12a284c07..850929aba 100644 --- a/unison-src/transcripts-using-base/doc.output.md +++ b/unison-src/transcripts-using-base/doc.output.md @@ -28,7 +28,7 @@ The 7 days of the week, defined as: unique type time.DayOfWeek = Sun | Mon | Tue | Wed | Thu | Fri | Sat ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -50,7 +50,7 @@ Notice that an anonymous documentation block `{{ ... }}` before a definition `Im You can preview what docs will look like when rendered to the console using the `display` or `docs` commands: -```ucm +``` ucm scratch/main> display d1 Hello there Alice! @@ -72,7 +72,7 @@ The `docs ImportantConstant` command will look for `ImportantConstant.doc` in th First, we'll load the `syntax.u` file which has examples of all the syntax: -```ucm +``` ucm scratch/main> load ./unison-src/transcripts-using-base/doc.md.files/syntax.u Loading changes detected in @@ -99,7 +99,7 @@ Now we can review different portions of the guide. we'll show both the pretty-printed source using `view` and the rendered output using `display`: -```ucm +``` ucm scratch/main> view basicFormatting basicFormatting : Doc2 @@ -548,7 +548,7 @@ scratch/main> display otherElements ``` Lastly, it's common to build longer documents including subdocuments via `{{ subdoc }}`. We can stitch together the full syntax guide in this way: -```ucm +``` ucm scratch/main> view doc.guide doc.guide : Doc2 diff --git a/unison-src/transcripts-using-base/failure-tests.output.md b/unison-src/transcripts-using-base/failure-tests.output.md index adbf9bc53..3a661894d 100644 --- a/unison-src/transcripts-using-base/failure-tests.output.md +++ b/unison-src/transcripts-using-base/failure-tests.output.md @@ -18,7 +18,7 @@ test2 = do [Ok "test2"] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -32,7 +32,7 @@ test2 = do test2 : '{IO, Exception} [Result] ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -41,7 +41,7 @@ scratch/main> add test2 : '{IO, Exception} [Result] ``` -```ucm +``` ucm scratch/main> io.test test1 💔💥 @@ -57,7 +57,7 @@ scratch/main> io.test test1 ##raise ``` -```ucm +``` ucm scratch/main> io.test test2 💔💥 diff --git a/unison-src/transcripts-using-base/fix2158-1.output.md b/unison-src/transcripts-using-base/fix2158-1.output.md index 2099749bc..9a692bb3d 100644 --- a/unison-src/transcripts-using-base/fix2158-1.output.md +++ b/unison-src/transcripts-using-base/fix2158-1.output.md @@ -11,7 +11,7 @@ Async.parMap f as = List.map await tasks ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts-using-base/fix2297.output.md b/unison-src/transcripts-using-base/fix2297.output.md index 3d8ca7d62..949cdd89e 100644 --- a/unison-src/transcripts-using-base/fix2297.output.md +++ b/unison-src/transcripts-using-base/fix2297.output.md @@ -24,7 +24,7 @@ wat = handleTrivial testAction -- Somehow this completely forgets about Excepti > handleTrivial testAction ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts-using-base/fix2358.output.md b/unison-src/transcripts-using-base/fix2358.output.md index 8c8582c27..7e71541b7 100644 --- a/unison-src/transcripts-using-base/fix2358.output.md +++ b/unison-src/transcripts-using-base/fix2358.output.md @@ -8,7 +8,7 @@ timingApp2 _ = printLine "World" ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -21,7 +21,7 @@ timingApp2 _ = timingApp2 : '{IO, Exception} () ``` -```ucm +``` ucm scratch/main> run timingApp2 () diff --git a/unison-src/transcripts-using-base/fix3166.output.md b/unison-src/transcripts-using-base/fix3166.output.md index 35e5815f9..9e33e1456 100644 --- a/unison-src/transcripts-using-base/fix3166.output.md +++ b/unison-src/transcripts-using-base/fix3166.output.md @@ -31,7 +31,7 @@ increment n = 1 + n Stream.toList s2 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -82,7 +82,7 @@ foo _ = > h foo 337 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -126,7 +126,7 @@ hmm = > hmm ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts-using-base/fix3542.output.md b/unison-src/transcripts-using-base/fix3542.output.md index 5d6fe4b53..976f1c063 100644 --- a/unison-src/transcripts-using-base/fix3542.output.md +++ b/unison-src/transcripts-using-base/fix3542.output.md @@ -13,7 +13,7 @@ arrayList v n = do > Scope.run '(catch (arrayList 7 8)) ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts-using-base/fix3939.output.md b/unison-src/transcripts-using-base/fix3939.output.md index 75c0dcbea..9240c712f 100644 --- a/unison-src/transcripts-using-base/fix3939.output.md +++ b/unison-src/transcripts-using-base/fix3939.output.md @@ -5,7 +5,7 @@ A simple doc. meh = 9 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -19,7 +19,7 @@ meh = 9 meh.doc : Doc2 ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts-using-base/fix4746.output.md b/unison-src/transcripts-using-base/fix4746.output.md index 62f7632c0..8887e3474 100644 --- a/unison-src/transcripts-using-base/fix4746.output.md +++ b/unison-src/transcripts-using-base/fix4746.output.md @@ -35,7 +35,7 @@ run s = () ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts-using-base/fix5129.output.md b/unison-src/transcripts-using-base/fix5129.output.md index 90f205bd4..3d07942a7 100644 --- a/unison-src/transcripts-using-base/fix5129.output.md +++ b/unison-src/transcripts-using-base/fix5129.output.md @@ -22,7 +22,7 @@ go = do foreach forkIt [thunk] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -56,7 +56,7 @@ fancyTryEval : '{g, IO, Exception} a ->{g, IO, Exception} a fancyTryEval = reraise << catchAll.impl ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts-using-base/hashing.output.md b/unison-src/transcripts-using-base/hashing.output.md index 721c1ec3c..3bede2577 100644 --- a/unison-src/transcripts-using-base/hashing.output.md +++ b/unison-src/transcripts-using-base/hashing.output.md @@ -2,7 +2,7 @@ Unison has cryptographic builtins for hashing and computing [HMACs](https://en.wikipedia.org/wiki/HMAC) (hash-based message authentication codes). This transcript shows their usage and has some test cases. -```ucm +``` ucm scratch/main> ls builtin.Bytes 1. ++ (Bytes -> Bytes -> Bytes) @@ -74,7 +74,7 @@ ex5 = crypto.hmac Sha2_256 mysecret f |> hex > ex5 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -119,7 +119,7 @@ ex5 = crypto.hmac Sha2_256 mysecret f |> hex ``` And here's the full API: -```ucm +``` ucm scratch/main> find-in builtin.crypto 1. type CryptoFailure @@ -159,7 +159,7 @@ Note that the universal versions of `hash` and `hmac` are currently unimplemente > hash Sha3_256 (fromHex "3849238492") ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -311,7 +311,7 @@ test> crypto.hash.numTests = checks (List.map t (range 0 20)) ``` -```ucm +``` ucm scratch/main> test Cached test results (`help testcache` to learn more) @@ -378,7 +378,7 @@ test> hmac_sha2_512.tests.ex2 = "164b7a7bfcf819e2e395fbe73b56e0a387bd64222e831fd610270cd7ea2505549758bf75c05a994a6d034f65f8f0e6fdcaeab1a34d4a6b4b636e070a38bce737" ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -441,7 +441,7 @@ test> md5.tests.ex3 = "e4d909c290d0fb1ca068ffaddf22cbd0" ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -473,7 +473,7 @@ test> md5.tests.ex3 = ✅ Passed Passed ``` -```ucm +``` ucm scratch/main> test Cached test results (`help testcache` to learn more) diff --git a/unison-src/transcripts-using-base/mvar.output.md b/unison-src/transcripts-using-base/mvar.output.md index 466291ead..c0bfdac99 100644 --- a/unison-src/transcripts-using-base/mvar.output.md +++ b/unison-src/transcripts-using-base/mvar.output.md @@ -50,7 +50,7 @@ testMvars _ = runTest test ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -64,7 +64,7 @@ testMvars _ = testMvars : '{IO} [Result] ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts-using-base/nat-coersion.output.md b/unison-src/transcripts-using-base/nat-coersion.output.md index dac858429..14d5c6685 100644 --- a/unison-src/transcripts-using-base/nat-coersion.output.md +++ b/unison-src/transcripts-using-base/nat-coersion.output.md @@ -31,7 +31,7 @@ test = 'let runTest testABunchOfNats ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -48,7 +48,7 @@ test = 'let ->{Stream Result} () ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts-using-base/net.output.md b/unison-src/transcripts-using-base/net.output.md index 702be91bb..4d95488cb 100644 --- a/unison-src/transcripts-using-base/net.output.md +++ b/unison-src/transcripts-using-base/net.output.md @@ -90,7 +90,7 @@ testDefaultPort _ = runTest test ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -105,7 +105,7 @@ testDefaultPort _ = testExplicitHost : '{IO} [Result] ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -177,7 +177,7 @@ testTcpConnect = 'let ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -192,7 +192,7 @@ testTcpConnect = 'let testTcpConnect : '{IO} [Result] ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts-using-base/random-deserial.output.md b/unison-src/transcripts-using-base/random-deserial.output.md index 66d6354d5..6c68e978e 100644 --- a/unison-src/transcripts-using-base/random-deserial.output.md +++ b/unison-src/transcripts-using-base/random-deserial.output.md @@ -55,7 +55,7 @@ serialTests = do List.map snd (bSort (List.map runTestCase cs)) ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -73,7 +73,7 @@ serialTests = do shuffle : Nat -> [a] -> [a] ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts-using-base/ref-promise.output.md b/unison-src/transcripts-using-base/ref-promise.output.md index bcc4487c3..b44e98bb9 100644 --- a/unison-src/transcripts-using-base/ref-promise.output.md +++ b/unison-src/transcripts-using-base/ref-promise.output.md @@ -18,7 +18,7 @@ casTest = do runTest test ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -31,7 +31,7 @@ casTest = do casTest : '{IO} [Result] ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -80,7 +80,7 @@ promiseConcurrentTest = do runTest test ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -94,7 +94,7 @@ promiseConcurrentTest = do promiseSequentialTest : '{IO} [Result] ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -134,7 +134,7 @@ atomicUpdate ref f = if Ref.cas ref ticket value then () else atomicUpdate ref f ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -147,7 +147,7 @@ atomicUpdate ref f = atomicUpdate : Ref {IO} a -> (a -> a) ->{IO} () ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -173,7 +173,7 @@ spawnN n fa = map Promise.read (go n []) ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -186,7 +186,7 @@ spawnN n fa = spawnN : Nat -> '{IO} a ->{IO} [a] ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -222,7 +222,7 @@ fullTest = do runTest test ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -235,7 +235,7 @@ fullTest = do fullTest : '{IO} [Result] ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts-using-base/serial-test-00.output.md b/unison-src/transcripts-using-base/serial-test-00.output.md index 019289ccd..ce996f93b 100644 --- a/unison-src/transcripts-using-base/serial-test-00.output.md +++ b/unison-src/transcripts-using-base/serial-test-00.output.md @@ -67,7 +67,7 @@ mkTestCase = do saveTestCase "case-00" "v4" f tup ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -94,7 +94,7 @@ mkTestCase = do tree3 : Tree Text ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts-using-base/serial-test-01.output.md b/unison-src/transcripts-using-base/serial-test-01.output.md index a1a9668c1..a6654a254 100644 --- a/unison-src/transcripts-using-base/serial-test-01.output.md +++ b/unison-src/transcripts-using-base/serial-test-01.output.md @@ -15,7 +15,7 @@ mkTestCase = do saveTestCase "case-01" "v4" combines (l1, l2, l3) ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -32,7 +32,7 @@ mkTestCase = do mkTestCase : '{IO, Exception} () ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts-using-base/serial-test-02.output.md b/unison-src/transcripts-using-base/serial-test-02.output.md index 3a352b88b..102fea092 100644 --- a/unison-src/transcripts-using-base/serial-test-02.output.md +++ b/unison-src/transcripts-using-base/serial-test-02.output.md @@ -29,7 +29,7 @@ mkTestCase = do ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -48,7 +48,7 @@ mkTestCase = do products : ([Nat], [Nat], [Nat]) -> Text ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts-using-base/serial-test-03.output.md b/unison-src/transcripts-using-base/serial-test-03.output.md index a1ca50f90..a20eafe7f 100644 --- a/unison-src/transcripts-using-base/serial-test-03.output.md +++ b/unison-src/transcripts-using-base/serial-test-03.output.md @@ -43,7 +43,7 @@ mkTestCase = do saveTestCase "case-03" "v4" finish trip ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -67,7 +67,7 @@ mkTestCase = do suspSum : [Nat] -> Delayed Nat ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts-using-base/serial-test-04.output.md b/unison-src/transcripts-using-base/serial-test-04.output.md index 0b0b6230e..990ce1479 100644 --- a/unison-src/transcripts-using-base/serial-test-04.output.md +++ b/unison-src/transcripts-using-base/serial-test-04.output.md @@ -12,7 +12,7 @@ mkTestCase = do saveTestCase "case-04" "v4" mutual1 5 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -27,7 +27,7 @@ mkTestCase = do mutual1 : Nat -> Text ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts-using-base/stm.output.md b/unison-src/transcripts-using-base/stm.output.md index fd8fb9728..2e7724f9e 100644 --- a/unison-src/transcripts-using-base/stm.output.md +++ b/unison-src/transcripts-using-base/stm.output.md @@ -28,7 +28,7 @@ body k out v = atomically '(TVar.write out (Some n)) ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -44,7 +44,7 @@ body k out v = loop : '{IO} Nat -> Nat -> Nat ->{IO} Nat ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -90,7 +90,7 @@ tests : '{io2.IO} [Result] tests = '(map spawn nats) ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -106,7 +106,7 @@ tests = '(map spawn nats) tests : '{IO} [Result] ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts-using-base/test-watch-dependencies.output.md b/unison-src/transcripts-using-base/test-watch-dependencies.output.md index b38e4373a..a32164356 100644 --- a/unison-src/transcripts-using-base/test-watch-dependencies.output.md +++ b/unison-src/transcripts-using-base/test-watch-dependencies.output.md @@ -15,7 +15,7 @@ x = 1000 test> mytest = checks [x + 1 == 1001] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -42,7 +42,7 @@ test> mytest = checks [x + 1 == 1001] ``` We expect this 'add' to fail because the test is blocked by the update to `x`. -```ucm +``` ucm scratch/main> add x These definitions failed: @@ -61,7 +61,7 @@ y = 42 test> useY = checks [y + 1 == 43] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -84,7 +84,7 @@ test> useY = checks [y + 1 == 43] ``` This should correctly identify `y` as a dependency and add that too. -```ucm +``` ucm scratch/main> add useY ⍟ I've added these definitions: diff --git a/unison-src/transcripts-using-base/thread.output.md b/unison-src/transcripts-using-base/thread.output.md index bab82e7eb..863d74969 100644 --- a/unison-src/transcripts-using-base/thread.output.md +++ b/unison-src/transcripts-using-base/thread.output.md @@ -16,7 +16,7 @@ testBasicFork = 'let ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -56,7 +56,7 @@ testBasicMultiThreadMVar = 'let ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -70,7 +70,7 @@ testBasicMultiThreadMVar = 'let thread1 : Nat -> MVar Nat -> '{IO} () ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -127,7 +127,7 @@ testTwoThreads = 'let ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -143,7 +143,7 @@ testTwoThreads = 'let testTwoThreads : '{IO} [Result] ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts-using-base/tls.output.md b/unison-src/transcripts-using-base/tls.output.md index fc0362d8c..76b9be278 100644 --- a/unison-src/transcripts-using-base/tls.output.md +++ b/unison-src/transcripts-using-base/tls.output.md @@ -27,7 +27,7 @@ this_should_not_work=match (decodeCert.impl (toUtf8 not_a_cert) with what_should_work _ = this_should_work ++ this_should_not_work ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -42,7 +42,7 @@ what_should_work _ = this_should_work ++ this_should_not_work what_should_work : ∀ _. _ -> [Result] ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -217,7 +217,7 @@ testCNReject _ = runTest test ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -237,7 +237,7 @@ testCNReject _ = testConnectSelfSigned : '{IO} [Result] ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts-using-base/utf8.output.md b/unison-src/transcripts-using-base/utf8.output.md index 0cd3d4c0d..15c15c027 100644 --- a/unison-src/transcripts-using-base/utf8.output.md +++ b/unison-src/transcripts-using-base/utf8.output.md @@ -2,7 +2,7 @@ Test for new Text -\> Bytes conversions explicitly using UTF-8 as the encoding Unison has function for converting between `Text` and a UTF-8 `Bytes` encoding of the Text. -```ucm +``` ucm scratch/main> find Utf8 1. builtin.Text.toUtf8 : Text -> Bytes @@ -21,7 +21,7 @@ ascii = "ABCDE" ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -51,7 +51,7 @@ greek = "ΑΒΓΔΕ" > toUtf8 greek ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -86,7 +86,7 @@ greek = "ΑΒΓΔΕ" test> greekTest = checkRoundTrip greek ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -121,7 +121,7 @@ greek_bytes = Bytes.fromList [206, 145, 206, 146, 206, 147, 206, 148, 206] ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/abilities.output.md b/unison-src/transcripts/abilities.output.md index 52428c98f..aa162e135 100644 --- a/unison-src/transcripts/abilities.output.md +++ b/unison-src/transcripts/abilities.output.md @@ -16,7 +16,7 @@ ha = cases { four i -> c } -> handle c (j k l -> i+j+k+l) with ha ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -30,7 +30,7 @@ ha = cases ha : Request {A} r -> r ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/ability-order-doesnt-affect-hash.output.md b/unison-src/transcripts/ability-order-doesnt-affect-hash.output.md index 7b98c2065..a61dd0045 100644 --- a/unison-src/transcripts/ability-order-doesnt-affect-hash.output.md +++ b/unison-src/transcripts/ability-order-doesnt-affect-hash.output.md @@ -14,7 +14,7 @@ term2 : () ->{Bar, Foo} () term2 _ = () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -30,7 +30,7 @@ term2 _ = () term2 : '{Bar, Foo} () ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/ability-term-conflicts-on-update.output.md b/unison-src/transcripts/ability-term-conflicts-on-update.output.md index a9bba9dbf..f5580e7b8 100644 --- a/unison-src/transcripts/ability-term-conflicts-on-update.output.md +++ b/unison-src/transcripts/ability-term-conflicts-on-update.output.md @@ -10,7 +10,7 @@ unique ability Channels where send : a -> {Channels} () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -23,7 +23,7 @@ unique ability Channels where ability Channels ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -46,7 +46,7 @@ thing : '{Channels} () thing _ = send 1 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -67,7 +67,7 @@ thing _ = send 1 ``` These should fail with a term/ctor conflict since we exclude the ability from the update. -```ucm +``` ucm scratch/main> update.old patch Channels.send x These definitions failed: @@ -102,7 +102,7 @@ thing : '{Channels} () thing _ = send 1 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -121,7 +121,7 @@ thing _ = send 1 ``` These updates should succeed since `Channels` is a dependency. -```ucm +``` ucm scratch/main> update.old.preview patch Channels.send I found and typechecked these definitions in scratch.u. If you @@ -152,7 +152,7 @@ scratch/main> update.old.preview patch thing ``` We should also be able to successfully update the whole thing. -```ucm +``` ucm scratch/main> update.old ⊡ Ignored previously added definitions: Channels @@ -169,7 +169,7 @@ scratch/main> update.old X.x = 1 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -182,7 +182,7 @@ X.x = 1 X.x : Nat ``` -```ucm +``` ucm scratch/main2> add ⍟ I've added these definitions: @@ -195,7 +195,7 @@ structural ability X where x : () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -214,7 +214,7 @@ structural ability X where ``` This should fail with a ctor/term conflict. -```ucm +``` ucm scratch/main2> add x These definitions failed: diff --git a/unison-src/transcripts/add-run.output.md b/unison-src/transcripts/add-run.output.md index c1802922f..acf50c24d 100644 --- a/unison-src/transcripts/add-run.output.md +++ b/unison-src/transcripts/add-run.output.md @@ -13,7 +13,7 @@ is2even : 'Boolean is2even = '(even 2) ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -30,7 +30,7 @@ is2even = '(even 2) ``` it errors if there isn't a previous run -```ucm +``` ucm scratch/main> add.run foo ⚠️ @@ -39,7 +39,7 @@ scratch/main> add.run foo something before attempting to save it. ``` -```ucm +``` ucm scratch/main> run is2even true @@ -48,7 +48,7 @@ scratch/main> run is2even it errors if the desired result name conflicts with a name in the unison file -```ucm +``` ucm scratch/main> add.run is2even ⚠️ @@ -59,7 +59,7 @@ scratch/main> add.run is2even ``` otherwise, the result is successfully persisted -```ucm +``` ucm scratch/main> add.run foo.bar.baz ⍟ I've added these definitions: @@ -67,7 +67,7 @@ scratch/main> add.run foo.bar.baz foo.bar.baz : Boolean ``` -```ucm +``` ucm scratch/main> view foo.bar.baz foo.bar.baz : Boolean @@ -87,7 +87,7 @@ main : '{IO, Exception} (Nat -> Nat -> Nat) main _ = y ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -102,7 +102,7 @@ main _ = y z : Nat -> Nat ``` -```ucm +``` ucm scratch/main> run main a b -> a Nat.+ b Nat.+ z 10 @@ -122,7 +122,7 @@ inc : Nat -> Nat inc x = x + 1 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -135,7 +135,7 @@ inc x = x + 1 inc : Nat -> Nat ``` -```ucm +``` ucm scratch/main> add inc ⍟ I've added these definitions: @@ -148,7 +148,7 @@ main : '(Nat -> Nat) main _ x = inc x ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -161,7 +161,7 @@ main _ x = inc x main : '(Nat -> Nat) ``` -```ucm +``` ucm scratch/main> run main inc @@ -186,7 +186,7 @@ y = x + x main = 'y ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -201,7 +201,7 @@ main = 'y y : Nat ``` -```ucm +``` ucm scratch/main> run main 2 @@ -211,7 +211,7 @@ scratch/main> run main x = 50 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -226,7 +226,7 @@ x = 50 ``` this saves 2 to xres, rather than 100 -```ucm +``` ucm scratch/main> add.run xres ⍟ I've added these definitions: @@ -245,7 +245,7 @@ scratch/main> view xres main = '5 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -258,7 +258,7 @@ main = '5 main : 'Nat ``` -```ucm +``` ucm scratch/main> run main 5 @@ -279,7 +279,7 @@ scratch/main> add.run xres main = '5 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -292,7 +292,7 @@ main = '5 main : 'Nat ``` -```ucm +``` ucm .> run main 5 diff --git a/unison-src/transcripts/add-test-watch-roundtrip.output.md b/unison-src/transcripts/add-test-watch-roundtrip.output.md index e276eba24..5366a4734 100644 --- a/unison-src/transcripts/add-test-watch-roundtrip.output.md +++ b/unison-src/transcripts/add-test-watch-roundtrip.output.md @@ -5,7 +5,7 @@ foo = [] Apparently when we add a test watch, we add a type annotation to it, even if it already has one. We don't want this to happen though\! -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/addupdatemessages.output.md b/unison-src/transcripts/addupdatemessages.output.md index 813639f58..cbf055271 100644 --- a/unison-src/transcripts/addupdatemessages.output.md +++ b/unison-src/transcripts/addupdatemessages.output.md @@ -10,7 +10,7 @@ structural type X = One Nat structural type Y = Two Nat Nat ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -28,7 +28,7 @@ structural type Y = Two Nat Nat ``` Expected: `x` and `y`, `X`, and `Y` exist as above. UCM tells you this. -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -47,7 +47,7 @@ z = 1 structural type Z = One Nat ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -66,7 +66,7 @@ structural type Z = One Nat Expected: `z` is now `1`. UCM tells you that this definition is also called `x`. Also, `Z` is an alias for `X`. -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -84,7 +84,7 @@ x = 3 structural type X = Three Nat Nat Nat ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -103,7 +103,7 @@ structural type X = Three Nat Nat Nat ``` Expected: `x` is now `3` and `X` has constructor `Three`. UCM tells you the old definitions were also called `z` and `Z` and these names have also been updated. -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be @@ -123,7 +123,7 @@ x = 2 structural type X = Two Nat Nat ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -142,7 +142,7 @@ structural type X = Two Nat Nat ``` Expected: `x` is now `2` and `X` is `Two`. UCM says the old definition was also named `z/Z`, and was also updated. And it says the new definition is also named `y/Y`. -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/alias-many.output.md b/unison-src/transcripts/alias-many.output.md index 942539b62..4a20a354c 100644 --- a/unison-src/transcripts/alias-many.output.md +++ b/unison-src/transcripts/alias-many.output.md @@ -10,7 +10,7 @@ The names that will be used in the target namespace are the names you specify, r Let's try it\! -```ucm +``` ucm scratch/main> alias.many List.adjacentPairs List.all List.any List.chunk List.chunksOf List.dropWhile List.first List.init List.intersperse List.isEmpty List.last List.replicate List.splitAt List.tail List.takeWhile mylib Here's what changed in mylib : diff --git a/unison-src/transcripts/alias-term.output.md b/unison-src/transcripts/alias-term.output.md index d072506cb..2c120239e 100644 --- a/unison-src/transcripts/alias-term.output.md +++ b/unison-src/transcripts/alias-term.output.md @@ -1,6 +1,6 @@ `alias.term` makes a new name for a term. -```ucm +``` ucm project/main> alias.term lib.builtins.bug foo Done. @@ -13,7 +13,7 @@ project/main> ls ``` It won't create a conflicted name, though. -```ucm +``` ucm project/main> alias.term lib.builtins.todo foo ⚠️ @@ -21,7 +21,7 @@ project/main> alias.term lib.builtins.todo foo A term by that name already exists. ``` -```ucm +``` ucm project/main> ls 1. foo (a -> b) @@ -30,7 +30,7 @@ project/main> ls ``` You can use `debug.alias.term.force` for that. -```ucm +``` ucm project/main> debug.alias.term.force lib.builtins.todo foo Done. diff --git a/unison-src/transcripts/alias-type.output.md b/unison-src/transcripts/alias-type.output.md index 820c81761..79a2fbcd7 100644 --- a/unison-src/transcripts/alias-type.output.md +++ b/unison-src/transcripts/alias-type.output.md @@ -1,6 +1,6 @@ `alias.type` makes a new name for a type. -```ucm +``` ucm project/main> alias.type lib.builtins.Nat Foo Done. @@ -13,7 +13,7 @@ project/main> ls ``` It won't create a conflicted name, though. -```ucm +``` ucm project/main> alias.type lib.builtins.Int Foo ⚠️ @@ -21,7 +21,7 @@ project/main> alias.type lib.builtins.Int Foo A type by that name already exists. ``` -```ucm +``` ucm project/main> ls 1. Foo (builtin type) @@ -30,7 +30,7 @@ project/main> ls ``` You can use `debug.alias.type.force` for that. -```ucm +``` ucm project/main> debug.alias.type.force lib.builtins.Int Foo Done. diff --git a/unison-src/transcripts/anf-tests.output.md b/unison-src/transcripts/anf-tests.output.md index b1dc2f599..0a1242dda 100644 --- a/unison-src/transcripts/anf-tests.output.md +++ b/unison-src/transcripts/anf-tests.output.md @@ -23,7 +23,7 @@ foo _ = > !foo ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -43,7 +43,7 @@ foo _ = 5 ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/any-extract.output.md b/unison-src/transcripts/any-extract.output.md index 8f3488cb4..342ef3fbb 100644 --- a/unison-src/transcripts/any-extract.output.md +++ b/unison-src/transcripts/any-extract.output.md @@ -11,7 +11,7 @@ test> Any.unsafeExtract.works = ] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -31,7 +31,7 @@ test> Any.unsafeExtract.works = ✅ Passed Passed ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/api-doc-rendering.output.md b/unison-src/transcripts/api-doc-rendering.output.md index 8afef59e8..271fac784 100644 --- a/unison-src/transcripts/api-doc-rendering.output.md +++ b/unison-src/transcripts/api-doc-rendering.output.md @@ -77,7 +77,7 @@ Transclusion/evaluation: term = 42 ``` -```ucm +``` ucm scratch/main> display term.doc # Heading @@ -146,7 +146,7 @@ scratch/main> display term.doc message ``` -```api +``` api GET /api/projects/scratch/branches/main/getDefinition?names=term { "missingDefinitions": [], diff --git a/unison-src/transcripts/api-find.output.md b/unison-src/transcripts/api-find.output.md index aecfe603a..24c34c837 100644 --- a/unison-src/transcripts/api-find.output.md +++ b/unison-src/transcripts/api-find.output.md @@ -7,7 +7,7 @@ joey.httpServer.z = 44 joey.yaml.zz = 45 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -23,7 +23,7 @@ joey.yaml.zz = 45 ross.httpClient.y : ##Nat ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -34,7 +34,7 @@ scratch/main> add ross.httpClient.y : ##Nat ``` -```api +``` api -- Namespace segment prefix search GET /api/projects/scratch/branches/main/find?query=http [ diff --git a/unison-src/transcripts/api-getDefinition.output.md b/unison-src/transcripts/api-getDefinition.output.md index bf244e4a0..6daa80c01 100644 --- a/unison-src/transcripts/api-getDefinition.output.md +++ b/unison-src/transcripts/api-getDefinition.output.md @@ -5,7 +5,7 @@ nested.names.x.doc = {{ Documentation }} nested.names.x = 42 ``` -```api +``` api -- Should NOT find names by suffix GET /api/projects/scratch/branches/main/getDefinition?names=x { @@ -216,7 +216,7 @@ doctest.otherstuff.thing = "A different thing" Only docs for the term we request should be returned, even if there are other term docs with the same suffix. -```api +``` api GET /api/projects/scratch/branches/main/getDefinition?names=thing&relativeTo=doctest { "missingDefinitions": [], @@ -334,7 +334,7 @@ GET /api/projects/scratch/branches/main/getDefinition?names=thing&relativeTo=doc } ```If we request a doc, the api should return the source, but also the rendered doc should appear in the 'termDocs' list. -```api +``` api GET /api/projects/scratch/branches/main/getDefinition?names=thing.doc&relativeTo=doctest { "missingDefinitions": [], diff --git a/unison-src/transcripts/api-list-projects-branches.output.md b/unison-src/transcripts/api-list-projects-branches.output.md index b3c09895d..5768b6454 100644 --- a/unison-src/transcripts/api-list-projects-branches.output.md +++ b/unison-src/transcripts/api-list-projects-branches.output.md @@ -1,6 +1,6 @@ # List Projects And Branches Test -```api +``` api -- Should list all projects GET /api/projects [ diff --git a/unison-src/transcripts/api-namespace-details.output.md b/unison-src/transcripts/api-namespace-details.output.md index 593efac4f..124c28e5d 100644 --- a/unison-src/transcripts/api-namespace-details.output.md +++ b/unison-src/transcripts/api-namespace-details.output.md @@ -9,7 +9,7 @@ Here's a *README*! }} ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -24,7 +24,7 @@ Here's a *README*! nested.names.x.doc : Doc2 ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -34,7 +34,7 @@ scratch/main> add nested.names.x.doc : Doc2 ``` -```api +``` api -- Should find names by suffix GET /api/projects/scratch/branches/main/namespaces/nested.names { diff --git a/unison-src/transcripts/api-namespace-list.output.md b/unison-src/transcripts/api-namespace-list.output.md index 6116dad61..1378a7d36 100644 --- a/unison-src/transcripts/api-namespace-list.output.md +++ b/unison-src/transcripts/api-namespace-list.output.md @@ -7,7 +7,7 @@ nested.names.x = 42 nested.names.readme = {{ I'm a readme! }} ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -22,7 +22,7 @@ nested.names.readme = {{ I'm a readme! }} nested.names.x.doc : Doc2 ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -32,7 +32,7 @@ scratch/main> add nested.names.x.doc : Doc2 ``` -```api +``` api GET /api/projects/scratch/branches/main/list?namespace=nested.names { "namespaceListingChildren": [ diff --git a/unison-src/transcripts/api-summaries.output.md b/unison-src/transcripts/api-summaries.output.md index de7e14c3a..115dba15a 100644 --- a/unison-src/transcripts/api-summaries.output.md +++ b/unison-src/transcripts/api-summaries.output.md @@ -21,7 +21,7 @@ structural ability Stream s where ## Term Summary APIs -```api +``` api -- term GET /api/projects/scratch/branches/main/definitions/terms/by-hash/@qkhkl0n238s1eqibd1ecb8605sqj1m4hpoaag177cu572otqlaf1u28c8suuuqgljdtthsjtr07rv04np05o6oa27ml9105k7uas0t8/summary?name=nat { @@ -669,7 +669,7 @@ GET /api/projects/scratch/branches/main/definitions/terms/by-hash/@@IO.putBytes. } ```## Type Summary APIs -```api +``` api -- data GET /api/projects/scratch/branches/main/definitions/types/by-hash/@altimqs66j3dh94dpab5pg7j5adjrndq61n803j7fg0v0ohdiut6or66bu1fiongpd45s5euiuo8ru47b928aqv8osln1ikdeg05hq0/summary?name=Thing { diff --git a/unison-src/transcripts/block-on-required-update.output.md b/unison-src/transcripts/block-on-required-update.output.md index 49e133246..20560c94c 100644 --- a/unison-src/transcripts/block-on-required-update.output.md +++ b/unison-src/transcripts/block-on-required-update.output.md @@ -6,7 +6,7 @@ Should block an `add` if it requires an update on an in-file dependency. x = 1 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -19,7 +19,7 @@ x = 1 x : Nat ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -34,7 +34,7 @@ x = 10 y = x + 1 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -54,7 +54,7 @@ y = x + 1 ``` Try to add only the new `y`. This should fail because it requires an update to `x`, but we only ran an 'add'. -```ucm +``` ucm scratch/main> add y x These definitions failed: diff --git a/unison-src/transcripts/blocks.output.md b/unison-src/transcripts/blocks.output.md index b017e0cfc..f52ca4f25 100644 --- a/unison-src/transcripts/blocks.output.md +++ b/unison-src/transcripts/blocks.output.md @@ -15,7 +15,7 @@ ex thing = > ex "hello" ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -48,7 +48,7 @@ ex thing = > ex "hello" ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -83,7 +83,7 @@ ex thing = > ex (x -> x * 100) ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -115,7 +115,7 @@ ex thing = > ex (x -> x * 100) ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -154,7 +154,7 @@ ex n = ping 42 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -181,7 +181,7 @@ ex n = ping 0 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -205,7 +205,7 @@ ex n = pong ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -223,7 +223,7 @@ ex n = loop ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -240,7 +240,7 @@ ex n = !loop ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -269,7 +269,7 @@ ex n = zap1 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -293,7 +293,7 @@ ex n = zap1 "pluto" ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -322,7 +322,7 @@ ex n = ping 42 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -349,7 +349,7 @@ ex n = ping 42 ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/boolean-op-pretty-print-2819.output.md b/unison-src/transcripts/boolean-op-pretty-print-2819.output.md index 7fe8f92cf..b840f4bbc 100644 --- a/unison-src/transcripts/boolean-op-pretty-print-2819.output.md +++ b/unison-src/transcripts/boolean-op-pretty-print-2819.output.md @@ -7,7 +7,7 @@ hangExample = && ("a long piece of text to hang the line" == "") ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -20,7 +20,7 @@ hangExample = hangExample : Boolean ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/branch-command.output.md b/unison-src/transcripts/branch-command.output.md index 569ab5d76..6a78b8e72 100644 --- a/unison-src/transcripts/branch-command.output.md +++ b/unison-src/transcripts/branch-command.output.md @@ -6,7 +6,7 @@ First, we'll create a term to include in the branches. someterm = 18 ``` -```ucm +``` ucm scratch/main> builtins.merge lib.builtins Done. @@ -23,7 +23,7 @@ Now, the `branch` demo: `branch` can create a branch from a different branch in the same project, from a different branch in a different project. It can also create an empty branch. -```ucm +``` ucm foo/main> branch topic1 Done. I've created the topic1 branch based off of main. @@ -151,7 +151,7 @@ scratch/main> branch.empty foo/empty4 ``` The `branch` command can create branches named `releases/drafts/*` (because why not). -```ucm +``` ucm foo/main> branch releases/drafts/1.2.3 Done. I've created the releases/drafts/1.2.3 branch based off @@ -165,7 +165,7 @@ foo/main> switch /releases/drafts/1.2.3 ``` The `branch` command can't create branches named `releases/*` nor `releases/drafts/*`. -```ucm +``` ucm foo/main> branch releases/1.2.3 Branch names like releases/1.2.3 are reserved for releases. diff --git a/unison-src/transcripts/branch-relative-path.output.md b/unison-src/transcripts/branch-relative-path.output.md index 591fa64f8..e9e33b5ad 100644 --- a/unison-src/transcripts/branch-relative-path.output.md +++ b/unison-src/transcripts/branch-relative-path.output.md @@ -3,7 +3,7 @@ foo = 5 foo.bar = 1 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -17,7 +17,7 @@ foo.bar = 1 foo.bar : ##Nat ``` -```ucm +``` ucm p0/main> add ⍟ I've added these definitions: @@ -31,7 +31,7 @@ bonk = 5 donk.bonk = 1 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -47,7 +47,7 @@ donk.bonk = 1 (also named foo.bar) ``` -```ucm +``` ucm p1/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/bug-fix-4354.output.md b/unison-src/transcripts/bug-fix-4354.output.md index 8ef9e7370..110aca002 100644 --- a/unison-src/transcripts/bug-fix-4354.output.md +++ b/unison-src/transcripts/bug-fix-4354.output.md @@ -8,7 +8,7 @@ bonk x = x ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/bug-strange-closure.output.md b/unison-src/transcripts/bug-strange-closure.output.md index 91f7ce998..ebd96be4a 100644 --- a/unison-src/transcripts/bug-strange-closure.output.md +++ b/unison-src/transcripts/bug-strange-closure.output.md @@ -1,6 +1,6 @@ We can display the guide before and after adding it to the codebase: -```ucm +``` ucm .> display doc.guide # Unison computable documentation @@ -417,7 +417,7 @@ But we can't display this due to a decompilation problem. rendered = Pretty.get (docFormatConsole doc.guide) ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -430,7 +430,7 @@ rendered = Pretty.get (docFormatConsole doc.guide) rendered : Annotated () (Either SpecialForm ConsoleText) ``` -```ucm +``` ucm .> display rendered # Unison computable documentation @@ -850,7 +850,7 @@ rendered = Pretty.get (docFormatConsole doc.guide) > rendered ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/builtins-merge.output.md b/unison-src/transcripts/builtins-merge.output.md index b79bdab58..814737577 100644 --- a/unison-src/transcripts/builtins-merge.output.md +++ b/unison-src/transcripts/builtins-merge.output.md @@ -1,6 +1,6 @@ The `builtins.merge` command adds the known builtins to the specified subnamespace within the current namespace. -```ucm +``` ucm scratch/main> builtins.merge builtins Done. diff --git a/unison-src/transcripts/builtins.output.md b/unison-src/transcripts/builtins.output.md index 5ddc4b765..3a4538f30 100644 --- a/unison-src/transcripts/builtins.output.md +++ b/unison-src/transcripts/builtins.output.md @@ -363,7 +363,7 @@ test> Any.test1 = checks [(Any "hi" == Any "hi")] test> Any.test2 = checks [(not (Any "hi" == Any 42))] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -415,7 +415,7 @@ test> Sandbox.test3 = checks [validateSandboxed [termLink openFile.impl] openFile] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -468,7 +468,7 @@ openFilesIO = do ] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -481,7 +481,7 @@ openFilesIO = do openFilesIO : '{IO} [Result] ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -508,7 +508,7 @@ Just exercises the function test> Universal.murmurHash.tests = checks [Universal.murmurHash [1,2,3] == Universal.murmurHash [1,2,3]] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -536,7 +536,7 @@ test> Universal.murmurHash.tests = checks [Universal.murmurHash [1,2,3] == Unive Now that all the tests have been added to the codebase, let's view the test report. This will fail the transcript (with a nice message) if any of the tests are failing. -```ucm +``` ucm scratch/main> test Cached test results (`help testcache` to learn more) diff --git a/unison-src/transcripts/bytesFromList.output.md b/unison-src/transcripts/bytesFromList.output.md index 099a73cb5..b4a978221 100644 --- a/unison-src/transcripts/bytesFromList.output.md +++ b/unison-src/transcripts/bytesFromList.output.md @@ -4,7 +4,7 @@ This should render as `Bytes.fromList [1,2,3,4]`, not `##Bytes.fromSequence [1,2 > Bytes.fromList [1,2,3,4] ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/check763.output.md b/unison-src/transcripts/check763.output.md index 0d5dcc0ba..7975553f1 100644 --- a/unison-src/transcripts/check763.output.md +++ b/unison-src/transcripts/check763.output.md @@ -5,7 +5,7 @@ Regression test for https://github.com/unisonweb/unison/issues/763 (+-+) x y = x * y ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -18,7 +18,7 @@ Regression test for https://github.com/unisonweb/unison/issues/763 +-+ : Nat -> Nat -> Nat ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/check873.output.md b/unison-src/transcripts/check873.output.md index cc952acca..fa6f046e8 100644 --- a/unison-src/transcripts/check873.output.md +++ b/unison-src/transcripts/check873.output.md @@ -4,7 +4,7 @@ See [this ticket](https://github.com/unisonweb/unison/issues/873); the point bei (-) = builtin.Nat.sub ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -17,7 +17,7 @@ See [this ticket](https://github.com/unisonweb/unison/issues/873); the point bei - : Nat -> Nat -> Int ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -29,7 +29,7 @@ scratch/main> add baz x = x - 1 ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/constructor-applied-to-unit.output.md b/unison-src/transcripts/constructor-applied-to-unit.output.md index 04cc3c417..e12d3f1d4 100644 --- a/unison-src/transcripts/constructor-applied-to-unit.output.md +++ b/unison-src/transcripts/constructor-applied-to-unit.output.md @@ -5,7 +5,7 @@ structural type Zoink a b c = Zoink a b c > [ Zoink [0,1,2,3,4,5] [6,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,4,3] () ] ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/contrabilities.output.md b/unison-src/transcripts/contrabilities.output.md index f3b76a8c5..ef0f98dff 100644 --- a/unison-src/transcripts/contrabilities.output.md +++ b/unison-src/transcripts/contrabilities.output.md @@ -3,7 +3,7 @@ f : (() -> a) -> Nat f x = 42 ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/create-author.output.md b/unison-src/transcripts/create-author.output.md index a71fca7b1..caa4d2740 100644 --- a/unison-src/transcripts/create-author.output.md +++ b/unison-src/transcripts/create-author.output.md @@ -1,6 +1,6 @@ Demonstrating `create.author`: -```ucm +``` ucm scratch/main> create.author alicecoder "Alice McGee" Added definitions: diff --git a/unison-src/transcripts/cycle-update-1.output.md b/unison-src/transcripts/cycle-update-1.output.md index 3cfeca6fc..b5dd6e69a 100644 --- a/unison-src/transcripts/cycle-update-1.output.md +++ b/unison-src/transcripts/cycle-update-1.output.md @@ -8,7 +8,7 @@ pong : 'Nat pong _ = !ping + 2 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -22,7 +22,7 @@ pong _ = !ping + 2 pong : 'Nat ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -36,7 +36,7 @@ ping : 'Nat ping _ = !pong + 3 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -50,7 +50,7 @@ ping _ = !pong + 3 ping : 'Nat ``` -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/cycle-update-2.output.md b/unison-src/transcripts/cycle-update-2.output.md index 11b97f14d..b9bdc363f 100644 --- a/unison-src/transcripts/cycle-update-2.output.md +++ b/unison-src/transcripts/cycle-update-2.output.md @@ -8,7 +8,7 @@ pong : 'Nat pong _ = !ping + 2 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -22,7 +22,7 @@ pong _ = !ping + 2 pong : 'Nat ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -36,7 +36,7 @@ ping : 'Nat ping _ = 3 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -50,7 +50,7 @@ ping _ = 3 ping : 'Nat ``` -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/cycle-update-3.output.md b/unison-src/transcripts/cycle-update-3.output.md index cf8c1c72c..15b0e2662 100644 --- a/unison-src/transcripts/cycle-update-3.output.md +++ b/unison-src/transcripts/cycle-update-3.output.md @@ -8,7 +8,7 @@ pong : 'Nat pong _ = !ping + 2 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -22,7 +22,7 @@ pong _ = !ping + 2 pong : 'Nat ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -36,7 +36,7 @@ ping : Nat ping = 3 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -50,7 +50,7 @@ ping = 3 ping : Nat ``` -```ucm +``` ucm scratch/main> update.old ⍟ I've updated these names to your new definition: diff --git a/unison-src/transcripts/cycle-update-4.output.md b/unison-src/transcripts/cycle-update-4.output.md index c3bcccbd1..2fec74ba8 100644 --- a/unison-src/transcripts/cycle-update-4.output.md +++ b/unison-src/transcripts/cycle-update-4.output.md @@ -8,7 +8,7 @@ pong : 'Nat pong _ = !ping + 2 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -22,7 +22,7 @@ pong _ = !ping + 2 pong : 'Nat ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -39,7 +39,7 @@ clang : 'Nat clang _ = !pong + 3 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -57,7 +57,7 @@ clang _ = !pong + 3 ping : 'Nat ``` -```ucm +``` ucm scratch/main> update.old ping ⍟ I've added these definitions: diff --git a/unison-src/transcripts/cycle-update-5.output.md b/unison-src/transcripts/cycle-update-5.output.md index a022fbed6..64f50af57 100644 --- a/unison-src/transcripts/cycle-update-5.output.md +++ b/unison-src/transcripts/cycle-update-5.output.md @@ -8,7 +8,7 @@ pong : 'Nat pong _ = !inner.ping + 2 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -22,7 +22,7 @@ pong _ = !inner.ping + 2 pong : 'Nat ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -39,7 +39,7 @@ inner.ping : 'Nat inner.ping _ = !pong + 3 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -53,7 +53,7 @@ inner.ping _ = !pong + 3 inner.ping : 'Nat ``` -```ucm +``` ucm ☝️ The namespace .inner is empty. .inner> update.old diff --git a/unison-src/transcripts/debug-definitions.output.md b/unison-src/transcripts/debug-definitions.output.md index 8689d2d78..9c4bb349c 100644 --- a/unison-src/transcripts/debug-definitions.output.md +++ b/unison-src/transcripts/debug-definitions.output.md @@ -12,7 +12,7 @@ ability Ask a where ask : a ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/debug-name-diffs.output.md b/unison-src/transcripts/debug-name-diffs.output.md index 0333dee6b..beed0b4cc 100644 --- a/unison-src/transcripts/debug-name-diffs.output.md +++ b/unison-src/transcripts/debug-name-diffs.output.md @@ -9,7 +9,7 @@ structural type a.x.Foo = Foo | Bar structural type a.b.Baz = Boo ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -27,7 +27,7 @@ structural type a.b.Baz = Boo a.x.three : ##Nat ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/deep-names.output.md b/unison-src/transcripts/deep-names.output.md index dcaf16dbe..114133d78 100644 --- a/unison-src/transcripts/deep-names.output.md +++ b/unison-src/transcripts/deep-names.output.md @@ -14,7 +14,7 @@ http.z = 8 Our `app1` project includes the text library twice and the http library twice as direct dependencies. -```ucm +``` ucm scratch/app1> fork text lib.text_v1 Done. @@ -42,7 +42,7 @@ scratch/app1> delete.namespace http ``` As such, we see two copies of `a` and two copies of `x` via these direct dependencies. -```ucm +``` ucm scratch/app1> names a Term @@ -63,7 +63,7 @@ scratch/app1> names x Our `app2` project includes the `http` library twice as direct dependencies, and once as an indirect dependency via `webutil`. It also includes the `text` library twice as indirect dependencies via `webutil` -```ucm +``` ucm scratch/app2> fork http lib.http_v1 Done. @@ -96,7 +96,7 @@ scratch/app2> delete.namespace text Now we see two copies of `x` via direct dependencies on `http`, and one copy of `a` via indirect dependency on `text` via `webutil`. We see neither the second indirect copy of `a` nor the indirect copy of `x` via webutil because we already have names for them. -```ucm +``` ucm scratch/app2> names a Term diff --git a/unison-src/transcripts/definition-diff-api.output.md b/unison-src/transcripts/definition-diff-api.output.md index 460e84d80..8d55cc785 100644 --- a/unison-src/transcripts/definition-diff-api.output.md +++ b/unison-src/transcripts/definition-diff-api.output.md @@ -1,4 +1,4 @@ -```ucm +``` ucm diffs/main> builtins.merge Done. @@ -12,7 +12,7 @@ term = type Type = Type Nat ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -26,7 +26,7 @@ type Type = Type Nat term : Nat ``` -```ucm +``` ucm diffs/main> add ⍟ I've added these definitions: @@ -50,7 +50,7 @@ term = type Type a = Type a Text ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -65,7 +65,7 @@ type Type a = Type a Text term : Nat ``` -```ucm +``` ucm diffs/new> update Okay, I'm searching the branch for code that needs to be @@ -76,7 +76,7 @@ diffs/new> update ``` Diff terms -```api +``` api GET /api/projects/diffs/diff/terms?oldBranchRef=main&newBranchRef=new&oldTerm=term&newTerm=term { "diff": { @@ -560,7 +560,7 @@ GET /api/projects/diffs/diff/terms?oldBranchRef=main&newBranchRef=new&oldTerm=te } ```Diff types -```api +``` api GET /api/projects/diffs/diff/types?oldBranchRef=main&newBranchRef=new&oldType=Type&newType=Type { "diff": { diff --git a/unison-src/transcripts/delete-namespace-dependents-check.output.md b/unison-src/transcripts/delete-namespace-dependents-check.output.md index ce131fcb7..134373103 100644 --- a/unison-src/transcripts/delete-namespace-dependents-check.output.md +++ b/unison-src/transcripts/delete-namespace-dependents-check.output.md @@ -10,7 +10,7 @@ sub.dependency = 123 dependent = dependency + 99 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -24,7 +24,7 @@ dependent = dependency + 99 sub.dependency : Nat ``` -```ucm +``` ucm myproject/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/delete-namespace.output.md b/unison-src/transcripts/delete-namespace.output.md index a57094d9e..288160895 100644 --- a/unison-src/transcripts/delete-namespace.output.md +++ b/unison-src/transcripts/delete-namespace.output.md @@ -12,7 +12,7 @@ dependents.usage2 = dependencies.term1 * dependencies.term2 Deleting a namespace with no external dependencies should succeed. -```ucm +``` ucm scratch/main> delete.namespace no_dependencies Done. @@ -20,7 +20,7 @@ scratch/main> delete.namespace no_dependencies ``` Deleting a namespace with external dependencies should fail and list all dependents. -```ucm +``` ucm scratch/main> delete.namespace dependencies ⚠️ @@ -41,7 +41,7 @@ scratch/main> delete.namespace dependencies ``` Deleting a namespace with external dependencies should succeed when using `delete.namespace.force` -```ucm +``` ucm scratch/main> delete.namespace.force dependencies Done. @@ -61,7 +61,7 @@ scratch/main> delete.namespace.force dependencies ``` I should be able to view an affected dependency by number -```ucm +``` ucm scratch/main> view 2 dependents.usage2 : Nat @@ -72,7 +72,7 @@ scratch/main> view 2 ``` Deleting the root namespace should require confirmation if not forced. -```ucm +``` ucm scratch/main> delete.namespace . ⚠️ @@ -94,7 +94,7 @@ scratch/main> history . ``` Deleting the root namespace shouldn't require confirmation if forced. -```ucm +``` ucm scratch/main> delete.namespace.force . Okay, I deleted everything except the history. Use `undo` to diff --git a/unison-src/transcripts/delete-project-branch.output.md b/unison-src/transcripts/delete-project-branch.output.md index 84568c97d..755d5f0c7 100644 --- a/unison-src/transcripts/delete-project-branch.output.md +++ b/unison-src/transcripts/delete-project-branch.output.md @@ -1,7 +1,7 @@ Deleting the branch you are on takes you to its parent (though this is impossible to see in a transcript, since we set your working directory with each command). -```ucm +``` ucm foo/main> branch topic Done. I've created the topic branch based off of main. @@ -14,7 +14,7 @@ foo/topic> delete.branch /topic ``` A branch need not be preceded by a forward slash. -```ucm +``` ucm foo/main> branch topic Done. I've created the topic branch based off of main. @@ -27,7 +27,7 @@ foo/topic> delete.branch topic ``` You can precede the branch name by a project name. -```ucm +``` ucm foo/main> branch topic Done. I've created the topic branch based off of main. @@ -40,7 +40,7 @@ scratch/main> delete.branch foo/topic ``` You can delete the only branch in a project. -```ucm +``` ucm foo/main> delete.branch /main ``` diff --git a/unison-src/transcripts/delete-project.output.md b/unison-src/transcripts/delete-project.output.md index e2b974a9c..2ee362e50 100644 --- a/unison-src/transcripts/delete-project.output.md +++ b/unison-src/transcripts/delete-project.output.md @@ -1,6 +1,6 @@ # delete.project -```ucm +``` ucm scratch/main> project.create-empty foo 🎉 I've created the project foo. diff --git a/unison-src/transcripts/delete-silent.output.md b/unison-src/transcripts/delete-silent.output.md index 899a38b3b..49c5a0860 100644 --- a/unison-src/transcripts/delete-silent.output.md +++ b/unison-src/transcripts/delete-silent.output.md @@ -1,4 +1,4 @@ -```ucm +``` ucm scratch/main> delete foo ⚠️ @@ -12,7 +12,7 @@ foo = 1 structural type Foo = Foo () ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/delete.output.md b/unison-src/transcripts/delete.output.md index 853f2ee38..178e92797 100644 --- a/unison-src/transcripts/delete.output.md +++ b/unison-src/transcripts/delete.output.md @@ -5,7 +5,7 @@ The delete command can delete both terms and types. First, let's make sure it complains when we try to delete a name that doesn't exist. -```ucm +``` ucm .> delete.verbose foo ⚠️ @@ -22,7 +22,7 @@ foo = 1 structural type Foo = Foo () ``` -```ucm +``` ucm .> add ⍟ I've added these definitions: @@ -62,7 +62,7 @@ foo = 1 bar = 2 ``` -```ucm +``` ucm ☝️ The namespace .a is empty. .a> add @@ -79,7 +79,7 @@ bar = 2 ``` A delete should remove both versions of the term. -```ucm +``` ucm .> delete.verbose a.foo Removed definitions: @@ -106,7 +106,7 @@ structural type Foo = Foo () structural type Bar = Bar ``` -```ucm +``` ucm .a> add ⍟ I've added these definitions: @@ -149,7 +149,7 @@ foo = 1 structural type foo = Foo () ``` -```ucm +``` ucm .> add ⍟ I've added these definitions: @@ -175,7 +175,7 @@ b = "b" c = "c" ``` -```ucm +``` ucm .> add ⍟ I've added these definitions: @@ -204,7 +204,7 @@ b = "b" c = "c" ``` -```ucm +``` ucm .> add ⍟ I've added these definitions: @@ -242,7 +242,7 @@ We can delete a type and its constructors structural type Foo = Foo () ``` -```ucm +``` ucm .> add ⍟ I've added these definitions: @@ -273,7 +273,7 @@ c = 3 d = a + b + c ``` -```ucm +``` ucm .> add ⍟ I've added these definitions: @@ -306,7 +306,7 @@ g = 13 + f h = e + f + g ``` -```ucm +``` ucm .> add ⍟ I've added these definitions: @@ -338,7 +338,7 @@ incrementFoo = cases (Foo n) -> n + 1 ``` -```ucm +``` ucm .> add ⍟ I've added these definitions: @@ -366,7 +366,7 @@ g = 13 + f h = e + f + g ``` -```ucm +``` ucm .> add ⍟ I've added these definitions: @@ -391,7 +391,7 @@ ping _ = 1 Nat.+ !pong pong _ = 4 Nat.+ !ping ``` -```ucm +``` ucm .> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/dependents-dependencies-debugfile.output.md b/unison-src/transcripts/dependents-dependencies-debugfile.output.md index 19b2526d7..a02c49169 100644 --- a/unison-src/transcripts/dependents-dependencies-debugfile.output.md +++ b/unison-src/transcripts/dependents-dependencies-debugfile.output.md @@ -16,7 +16,7 @@ inside.q x = x + p * p inside.r = d ``` -```ucm +``` ucm scratch/main> debug.file type inside.M#h37a56c5ep @@ -35,7 +35,7 @@ This will help me make progress in some situations when UCM is being deficient o But wait, there's more. I can check the dependencies and dependents of a definition: -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/destructuring-binds.output.md b/unison-src/transcripts/destructuring-binds.output.md index ec7f39182..371864ee9 100644 --- a/unison-src/transcripts/destructuring-binds.output.md +++ b/unison-src/transcripts/destructuring-binds.output.md @@ -14,7 +14,7 @@ ex1 tup = c + d ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -28,7 +28,7 @@ ex1 tup = ex1 : (a, b, (Nat, Nat)) -> Nat ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -58,7 +58,7 @@ ex2 tup = match tup with (a, b, (c,d)) -> c + d ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -82,7 +82,7 @@ ex4 = "Doesn't typecheck" ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -116,7 +116,7 @@ ex5a _ = match (99 + 1, "hi") with _ -> "impossible" ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -130,7 +130,7 @@ ex5a _ = match (99 + 1, "hi") with ex5a : 'Text ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -162,7 +162,7 @@ ex6 x = match x with For clarity, the pretty-printer leaves this alone, even though in theory it could be written `(x,y) = x; x + y`: -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/diff-namespace.output.md b/unison-src/transcripts/diff-namespace.output.md index 2c327bc83..32cfbb27b 100644 --- a/unison-src/transcripts/diff-namespace.output.md +++ b/unison-src/transcripts/diff-namespace.output.md @@ -6,7 +6,7 @@ b2.fslkdjflskdjflksjdf = 23 b2.abc = 23 ``` -```ucm +``` ucm .> add ⍟ I've added these definitions: @@ -22,7 +22,7 @@ b2.abc = 23 Done. ``` -```ucm +``` ucm .> diff.namespace b1 b2 Resolved name conflicts: @@ -78,7 +78,7 @@ structural type A a = A () structural ability X a1 a2 where x : () ``` -```ucm +``` ucm ☝️ The namespace .ns1 is empty. .ns1> add @@ -108,7 +108,7 @@ structural ability X a1 a2 where x : () ``` Here's what we've done so far: -```ucm +``` ucm .> diff.namespace nothing ns1 ⚠️ @@ -116,7 +116,7 @@ Here's what we've done so far: The namespace .nothing is empty. Was there a typo? ``` -```ucm +``` ucm .> diff.namespace ns1 ns2 The namespaces are identical. @@ -126,7 +126,7 @@ Here's what we've done so far: junk = "asldkfjasldkfj" ``` -```ucm +``` ucm .ns1> add ⍟ I've added these definitions: @@ -151,7 +151,7 @@ f = 6 unique type Y a b = Y a b ``` -```ucm +``` ucm .ns2> update.old ⍟ I've added these definitions: @@ -287,7 +287,7 @@ unique type Y a b = Y a b bdependent = "banana" ``` -```ucm +``` ucm .ns3> update.old ⍟ I've updated these names to your new definition: @@ -321,7 +321,7 @@ a = 333 b = a + 1 ``` -```ucm +``` ucm ☝️ The namespace .nsx is empty. .nsx> add @@ -344,7 +344,7 @@ b = a + 1 a = 444 ``` -```ucm +``` ucm .nsy> update.old ⍟ I've updated these names to your new definition: @@ -356,7 +356,7 @@ a = 444 a = 555 ``` -```ucm +``` ucm .nsz> update.old ⍟ I've updated these names to your new definition: @@ -376,7 +376,7 @@ a = 555 Done. ``` -```ucm +``` ucm .> diff.namespace nsx nsw New name conflicts: @@ -416,7 +416,7 @@ a = 555 x = 1 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -429,7 +429,7 @@ x = 1 x : ##Nat ``` -```ucm +``` ucm ☝️ The namespace .hashdiff is empty. .hashdiff> add @@ -443,7 +443,7 @@ x = 1 y = 2 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -456,7 +456,7 @@ y = 2 y : ##Nat ``` -```ucm +``` ucm .hashdiff> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/doc-formatting.output.md b/unison-src/transcripts/doc-formatting.output.md index a99d2ca4b..9a8d60c8b 100644 --- a/unison-src/transcripts/doc-formatting.output.md +++ b/unison-src/transcripts/doc-formatting.output.md @@ -9,7 +9,7 @@ foo n = n + 1 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -22,7 +22,7 @@ foo n = foo : Nat -> Nat ``` -```ucm +``` ucm scratch/main> view foo foo : Nat -> Nat @@ -38,7 +38,7 @@ Note that `@` and `:]` must be escaped within docs. escaping = [: Docs look [: like \@this \:] :] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -51,7 +51,7 @@ escaping = [: Docs look [: like \@this \:] :] escaping : Doc ``` -```ucm +``` ucm scratch/main> view escaping escaping : Doc @@ -70,7 +70,7 @@ commented = [: :] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -83,7 +83,7 @@ commented = [: commented : Doc ``` -```ucm +``` ucm scratch/main> view commented commented : Doc @@ -105,7 +105,7 @@ Handling of indenting in docs between the parser and pretty-printer is a bit fid doc1 = [: hi :] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -118,7 +118,7 @@ doc1 = [: hi :] doc1 : Doc ``` -```ucm +``` ucm scratch/main> view doc1 doc1 : Doc @@ -137,7 +137,7 @@ doc2 = [: hello and the rest. :] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -150,7 +150,7 @@ doc2 = [: hello doc2 : Doc ``` -```ucm +``` ucm scratch/main> view doc2 doc2 : Doc @@ -176,7 +176,7 @@ Note that because of the special treatment of the first line mentioned above, wh :] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -189,7 +189,7 @@ Note that because of the special treatment of the first line mentioned above, wh doc3 : Doc ``` -```ucm +``` ucm scratch/main> view doc3 doc3 : Doc @@ -223,7 +223,7 @@ doc4 = [: Here's another example of some paragraphs. - Apart from this one. :] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -236,7 +236,7 @@ doc4 = [: Here's another example of some paragraphs. doc4 : Doc ``` -```ucm +``` ucm scratch/main> view doc4 doc4 : Doc @@ -258,7 +258,7 @@ doc5 = [: - foo and the rest. :] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -271,7 +271,7 @@ doc5 = [: - foo doc5 : Doc ``` -```ucm +``` ucm scratch/main> view doc5 doc5 : Doc @@ -290,7 +290,7 @@ doc6 = [: :] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -303,7 +303,7 @@ doc6 = [: doc6 : Doc ``` -```ucm +``` ucm scratch/main> view doc6 doc6 : Doc @@ -323,7 +323,7 @@ empty = [::] expr = foo 1 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -337,7 +337,7 @@ expr = foo 1 expr : Nat ``` -```ucm +``` ucm scratch/main> view empty empty : Doc @@ -384,7 +384,7 @@ para line lorem ipsum dolor lorem ipsum dolor lorem ipsum dolor lorem ipsum dolo :] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -397,7 +397,7 @@ para line lorem ipsum dolor lorem ipsum dolor lorem ipsum dolor lorem ipsum dolo test1 : Doc ``` -```ucm +``` ucm scratch/main> view test1 test1 : Doc @@ -466,7 +466,7 @@ reg1363 = [: `@List.take foo` bar baz :] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -479,7 +479,7 @@ reg1363 = [: `@List.take foo` bar reg1363 : Doc ``` -```ucm +``` ucm scratch/main> view reg1363 reg1363 : Doc @@ -496,7 +496,7 @@ test2 = [: :] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -511,7 +511,7 @@ test2 = [: ``` View is fine. -```ucm +``` ucm scratch/main> view test2 test2 : Doc @@ -523,7 +523,7 @@ scratch/main> view test2 ``` But note it's not obvious how display should best be handling this. At the moment it just does the simplest thing: -```ucm +``` ucm scratch/main> display test2 Take a look at this: diff --git a/unison-src/transcripts/doc-type-link-keywords.output.md b/unison-src/transcripts/doc-type-link-keywords.output.md index 3229bed19..e1b04a715 100644 --- a/unison-src/transcripts/doc-type-link-keywords.output.md +++ b/unison-src/transcripts/doc-type-link-keywords.output.md @@ -25,7 +25,7 @@ docs.example4 = {{A doc that links to the {type Labels} type}} Now we check that each doc links to the object of the correct name: -```ucm +``` ucm scratch/main> display docs.example1 A doc that links to the abilityPatterns term diff --git a/unison-src/transcripts/doc1.output.md b/unison-src/transcripts/doc1.output.md index bd5b5b255..3c15677ba 100644 --- a/unison-src/transcripts/doc1.output.md +++ b/unison-src/transcripts/doc1.output.md @@ -2,7 +2,7 @@ Unison documentation is written in Unison. Documentation is a value of the following type: -```ucm +``` ucm scratch/main> view lib.builtins.Doc type lib.builtins.Doc @@ -26,7 +26,7 @@ Can link to definitions like @List.drop or @List :] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -58,7 +58,7 @@ List.take.ex1 = take 0 [1,2,3,4,5] List.take.ex2 = take 2 [1,2,3,4,5] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -72,7 +72,7 @@ List.take.ex2 = take 2 [1,2,3,4,5] List.take.ex2 : [Nat] ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -100,7 +100,7 @@ List.take.doc = [: :] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -115,7 +115,7 @@ List.take.doc = [: ``` Let's add it to the codebase. -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -125,7 +125,7 @@ scratch/main> add ``` We can view it with `docs`, which shows the `Doc` value that is associated with a definition. -```ucm +``` ucm scratch/main> docs List.take `List.take n xs` returns the first `n` elements of `xs`. (No @@ -150,7 +150,7 @@ scratch/main> docs List.take ``` Note that if we view the source of the documentation, the various references are *not* expanded. -```ucm +``` ucm scratch/main> view List.take builtin lib.builtins.List.take : diff --git a/unison-src/transcripts/doc2.output.md b/unison-src/transcripts/doc2.output.md index 0d09b5618..dc8330c53 100644 --- a/unison-src/transcripts/doc2.output.md +++ b/unison-src/transcripts/doc2.output.md @@ -109,7 +109,7 @@ Inline '' text literal with 1 space of padding '' in the middle of a sentence. Format it to check that everything pretty-prints in a valid way. -```ucm +``` ucm scratch/main> debug.format ``` diff --git a/unison-src/transcripts/doc2markdown.output.md b/unison-src/transcripts/doc2markdown.output.md index e670bff8c..d8a6b6942 100644 --- a/unison-src/transcripts/doc2markdown.output.md +++ b/unison-src/transcripts/doc2markdown.output.md @@ -81,7 +81,7 @@ Table }} ``` -```ucm +``` ucm scratch/main> debug.doc-to-markdown fulldoc Heres some text with a soft line break @@ -174,7 +174,7 @@ unique type MyUniqueType = MyUniqueType structural type MyStructuralType = MyStructuralType ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/dont-upgrade-refs-that-exist-in-old.output.md b/unison-src/transcripts/dont-upgrade-refs-that-exist-in-old.output.md index 5bbf2fb0b..9e369c57c 100644 --- a/unison-src/transcripts/dont-upgrade-refs-that-exist-in-old.output.md +++ b/unison-src/transcripts/dont-upgrade-refs-that-exist-in-old.output.md @@ -8,7 +8,7 @@ lib.new.foo = 19 mything = lib.old.foo + lib.old.foo ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -24,7 +24,7 @@ mything = lib.old.foo + lib.old.foo mything : Nat ``` -```ucm +``` ucm foo/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/duplicate-names.output.md b/unison-src/transcripts/duplicate-names.output.md index a9d9f2ad0..7e1e83851 100644 --- a/unison-src/transcripts/duplicate-names.output.md +++ b/unison-src/transcripts/duplicate-names.output.md @@ -10,7 +10,7 @@ Stream.send : a -> () Stream.send _ = () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -33,7 +33,7 @@ X.x : a -> () X.x _ = () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -55,7 +55,7 @@ structural ability X where x : () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -76,7 +76,7 @@ X.x.set = () X.x = () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -109,7 +109,7 @@ structural type X = Z X = () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -124,7 +124,7 @@ X = () X : () ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/duplicate-term-detection.output.md b/unison-src/transcripts/duplicate-term-detection.output.md index 3751e75f8..b726a6a94 100644 --- a/unison-src/transcripts/duplicate-term-detection.output.md +++ b/unison-src/transcripts/duplicate-term-detection.output.md @@ -7,7 +7,7 @@ x = 1 x = 2 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -26,7 +26,7 @@ x = 1 x = 1 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -47,7 +47,7 @@ Record.x.set = 2 Record.x.modify = 2 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -85,7 +85,7 @@ structural ability AnAbility where AnAbility.thing = 2 ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/ed25519.output.md b/unison-src/transcripts/ed25519.output.md index 2679028d4..0647c3199 100644 --- a/unison-src/transcripts/ed25519.output.md +++ b/unison-src/transcripts/ed25519.output.md @@ -19,7 +19,7 @@ sigOkay = match signature with > sigOkay ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/edit-command.output.md b/unison-src/transcripts/edit-command.output.md index 8470de948..e13d5cea9 100644 --- a/unison-src/transcripts/edit-command.output.md +++ b/unison-src/transcripts/edit-command.output.md @@ -1,4 +1,4 @@ -```ucm +``` ucm scratch/main> builtins.merge Done. @@ -16,7 +16,7 @@ mytest = [Ok "ok"] ``` -```ucm +``` ucm Loading changes detected in /private/tmp/scratch.u. @@ -31,7 +31,7 @@ mytest = [Ok "ok"] mytest : [Result] ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -71,7 +71,7 @@ foo = 123 test> mytest = [Ok "ok"] ``` -```ucm +``` ucm scratch/main> edit missing ⚠️ diff --git a/unison-src/transcripts/edit-namespace.output.md b/unison-src/transcripts/edit-namespace.output.md index 67e24e064..452a5d388 100644 --- a/unison-src/transcripts/edit-namespace.output.md +++ b/unison-src/transcripts/edit-namespace.output.md @@ -17,7 +17,7 @@ lib.project.ignoreMe = 30 unique type Foo = { bar : Nat, baz : Nat } ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -44,7 +44,7 @@ unique type Foo = { bar : Nat, baz : Nat } toplevel : Text ``` -```ucm +``` ucm project/main> add ⍟ I've added these definitions: @@ -68,7 +68,7 @@ project/main> add ``` `edit.namespace` edits the whole namespace (minus the top-level `lib`). -```ucm +``` ucm project/main> edit.namespace ☝️ @@ -110,7 +110,7 @@ toplevel = "hi" `edit.namespace` can also accept explicit paths -```ucm +``` ucm project/main> edit.namespace nested simple ☝️ diff --git a/unison-src/transcripts/empty-namespaces.output.md b/unison-src/transcripts/empty-namespaces.output.md index 4bea6f5b5..409dfcd51 100644 --- a/unison-src/transcripts/empty-namespaces.output.md +++ b/unison-src/transcripts/empty-namespaces.output.md @@ -6,13 +6,13 @@ mynamespace.x = 1 The deleted namespace shouldn't appear in `ls` output. -```ucm +``` ucm scratch/main> ls nothing to show ``` -```ucm +``` ucm scratch/main> find.verbose ☝️ @@ -29,7 +29,7 @@ scratch/main> find.verbose namespace. ``` -```ucm +``` ucm scratch/main> find mynamespace ☝️ @@ -50,7 +50,7 @@ scratch/main> find mynamespace The history of the namespace should be empty. -```ucm +``` ucm scratch/main> history mynamespace ☝️ The namespace mynamespace is empty. @@ -67,7 +67,7 @@ stuff.thing = 2 I should be allowed to fork over a deleted namespace -```ucm +``` ucm scratch/main> fork stuff deleted Done. @@ -75,7 +75,7 @@ scratch/main> fork stuff deleted ``` The history from the `deleted` namespace should have been overwritten by the history from `stuff`. -```ucm +``` ucm scratch/main> history stuff Note: The most recent namespace hash is immediately below this @@ -105,7 +105,7 @@ moveme.y = 2 I should be able to move a namespace over-top of a deleted namespace. The history should be that of the moved namespace. -```ucm +``` ucm scratch/main> delete.namespace moveoverme Done. diff --git a/unison-src/transcripts/emptyCodebase.output.md b/unison-src/transcripts/emptyCodebase.output.md index 4a8b1cff1..86c4b63ff 100644 --- a/unison-src/transcripts/emptyCodebase.output.md +++ b/unison-src/transcripts/emptyCodebase.output.md @@ -6,7 +6,7 @@ Not even `Nat` or `+`\! BEHOLD\!\!\! -```ucm +``` ucm scratch/main> ls nothing to show @@ -14,7 +14,7 @@ scratch/main> ls ``` Technically, the definitions all exist, but they have no names. `builtins.merge` brings them into existence, under the current namespace: -```ucm +``` ucm scratch/main> builtins.merge lib.builtins Done. @@ -26,7 +26,7 @@ scratch/main> ls lib ``` And for a limited time, you can get even more builtin goodies: -```ucm +``` ucm scratch/main> builtins.mergeio lib.builtinsio Done. diff --git a/unison-src/transcripts/error-messages.output.md b/unison-src/transcripts/error-messages.output.md index 694f20f4c..ed5d4c178 100644 --- a/unison-src/transcripts/error-messages.output.md +++ b/unison-src/transcripts/error-messages.output.md @@ -10,7 +10,7 @@ Some basic errors of literals. x = 1. -- missing some digits after the decimal ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -26,7 +26,7 @@ x = 1. -- missing some digits after the decimal x = 1e -- missing an exponent ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -42,7 +42,7 @@ x = 1e -- missing an exponent x = 1e- -- missing an exponent ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -58,7 +58,7 @@ x = 1e- -- missing an exponent x = 1E+ -- missing an exponent ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -76,7 +76,7 @@ x = 1E+ -- missing an exponent x = 0xoogabooga -- invalid hex chars ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -92,7 +92,7 @@ x = 0xoogabooga -- invalid hex chars x = 0o987654321 -- 9 and 8 are not valid octal char ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -108,7 +108,7 @@ x = 0o987654321 -- 9 and 8 are not valid octal char x = 0xsf -- odd number of hex chars in a bytes literal ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -124,7 +124,7 @@ x = 0xsf -- odd number of hex chars in a bytes literal x = 0xsnotvalidhexchars -- invalid hex chars in a bytes literal ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -142,7 +142,7 @@ x = 0xsnotvalidhexchars -- invalid hex chars in a bytes literal foo = else -- not matching if ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -156,7 +156,7 @@ foo = else -- not matching if foo = then -- unclosed ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -170,7 +170,7 @@ foo = then -- unclosed foo = with -- unclosed ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -187,7 +187,7 @@ foo = with -- unclosed foo = match 1 with ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -205,7 +205,7 @@ foo = match 1 with 2 -- no right-hand-side ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -229,7 +229,7 @@ foo = cases 3 -> () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -252,7 +252,7 @@ x = match Some a with 2 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -280,7 +280,7 @@ x = match Some a with -> 3 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -302,7 +302,7 @@ x = match Some a with | true -> 2 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -324,7 +324,7 @@ x = match Some a with > ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -340,7 +340,7 @@ x = match Some a with use.keyword.in.namespace = 1 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -357,7 +357,7 @@ use.keyword.in.namespace = 1 a ! b = 1 ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/escape-sequences.output.md b/unison-src/transcripts/escape-sequences.output.md index 0834375f1..955b6e8fe 100644 --- a/unison-src/transcripts/escape-sequences.output.md +++ b/unison-src/transcripts/escape-sequences.output.md @@ -4,7 +4,7 @@ > "古池や蛙飛びこむ水の音" ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/find-by-type.output.md b/unison-src/transcripts/find-by-type.output.md index 476f6ff80..c45fcd6a8 100644 --- a/unison-src/transcripts/find-by-type.output.md +++ b/unison-src/transcripts/find-by-type.output.md @@ -12,7 +12,7 @@ baz = cases A t -> t ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -39,7 +39,7 @@ scratch/main> find : A ``` -```ucm +``` ucm scratch/main> find : Text ☝️ diff --git a/unison-src/transcripts/find-command.output.md b/unison-src/transcripts/find-command.output.md index e4c4f6fe7..7abbe26f0 100644 --- a/unison-src/transcripts/find-command.output.md +++ b/unison-src/transcripts/find-command.output.md @@ -8,7 +8,7 @@ cat.lib.bar = 6 somewhere.bar = 7 ``` -```ucm +``` ucm scratch/main> find foo 1. cat.foo : Nat @@ -34,7 +34,7 @@ scratch/main> view 1 cat.foo = 4 ``` -```ucm +``` ucm scratch/main> find-in cat foo 1. foo : Nat @@ -59,7 +59,7 @@ scratch/main> view 1 ``` Finding within a namespace -```ucm +``` ucm scratch/main> find bar 1. somewhere.bar : Nat @@ -73,7 +73,7 @@ scratch/main> find-in somewhere bar ``` -```ucm +``` ucm scratch/main> find baz ☝️ @@ -90,7 +90,7 @@ scratch/main> find baz namespace. ``` -```ucm +``` ucm scratch/main> find.global notHere 😶 diff --git a/unison-src/transcripts/fix-1381-excess-propagate.output.md b/unison-src/transcripts/fix-1381-excess-propagate.output.md index 373289970..edc30e9f2 100644 --- a/unison-src/transcripts/fix-1381-excess-propagate.output.md +++ b/unison-src/transcripts/fix-1381-excess-propagate.output.md @@ -7,7 +7,7 @@ a = "a term" X.foo = "a namespace" ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -22,7 +22,7 @@ Here is an update which should not affect `X`: a = "an update" ``` -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be @@ -33,7 +33,7 @@ scratch/main> update ``` As of the time of this writing, the history for `X` should be a single node, `#4eeuo5bsfr`; -```ucm +``` ucm scratch/main> history X Note: The most recent namespace hash is immediately below this @@ -46,7 +46,7 @@ scratch/main> history X ``` however, as of release/M1i, we saw an extraneous node appear. If your `ucm` is fixed, you won't see it below: -```ucm +``` ucm scratch/main> history #7nl6ppokhg 😶 diff --git a/unison-src/transcripts/fix-big-list-crash.output.md b/unison-src/transcripts/fix-big-list-crash.output.md index 5661b0339..f6db0fb0b 100644 --- a/unison-src/transcripts/fix-big-list-crash.output.md +++ b/unison-src/transcripts/fix-big-list-crash.output.md @@ -8,7 +8,7 @@ unique type Direction = U | D | L | R x = [(R,1005),(U,563),(R,417),(U,509),(L,237),(U,555),(R,397),(U,414),(L,490),(U,336),(L,697),(D,682),(L,180),(U,951),(L,189),(D,547),(R,697),(U,583),(L,172),(D,859),(L,370),(D,114),(L,519),(U,829),(R,389),(U,608),(R,66),(D,634),(L,320),(D,49),(L,931),(U,137),(L,349),(D,689),(L,351),(D,829),(R,819),(D,138),(L,118),(D,849),(R,230),(U,858),(L,509),(D,311),(R,815),(U,217),(R,359),(U,840),(R,77),(U,230),(R,361),(U,322),(R,300),(D,646),(R,348),(U,815),(R,793),(D,752),(R,967),(U,128),(R,948),(D,499),(R,359),(U,572),(L,566),(U,815),(R,630),(D,290),(L,829),(D,736),(R,358),(U,778),(R,891),(U,941),(R,544),(U,889),(L,920),(U,913),(L,447),(D,604),(R,538),(U,818),(L,215),(D,437),(R,447),(U,576),(R,452),(D,794),(R,864),(U,269),(L,325),(D,35),(L,268),(D,639),(L,101),(U,777),(L,776),(U,958),(R,105),(U,517),(R,667),(D,423),(R,603),(U,469),(L,125),(D,919),(R,879),(U,994),(R,665),(D,377),(R,456),(D,570),(L,685),(U,291),(R,261),(U,846),(R,840),(U,418),(L,974),(D,270),(L,312),(D,426),(R,621),(D,334),(L,855),(D,378),(R,694),(U,845),(R,481),(U,895),(L,362),(D,840),(L,712),(U,57),(R,276),(D,643),(R,566),(U,348),(R,361),(D,144),(L,287),(D,864),(L,556),(U,610),(L,927),(U,322),(R,271),(D,90),(L,741),(U,446),(R,181),(D,527),(R,56),(U,805),(L,907),(D,406),(L,286),(U,873),(L,79),(D,280),(L,153),(D,377),(R,253),(D,61),(R,475),(D,804),(R,788),(U,393),(L,660),(U,314),(R,489),(D,491),(L,234),(D,712),(L,253),(U,651),(L,777),(D,726),(R,146),(U,47),(R,630),(U,517),(R,226),(U,624),(L,834),(D,153),(L,513),(U,799),(R,287),(D,868),(R,982),(U,390),(L,296),(D,373),(R,9),(U,994),(R,105),(D,673),(L,657),(D,868),(R,738),(D,277),(R,374),(U,828),(R,860),(U,247),(R,484),(U,986),(L,723),(D,847),(L,578),(U,487),(L,51),(D,865),(L,328),(D,199),(R,812),(D,726),(R,355),(D,463),(R,761),(U,69),(R,508),(D,753),(L,81),(D,50),(L,345),(D,66),(L,764),(D,466),(L,975),(U,619),(R,59),(D,788),(L,737),(D,360),(R,14),(D,253),(L,512),(D,417),(R,828),(D,188),(L,394),(U,212),(R,658),(U,369),(R,920),(U,927),(L,339),(U,552),(R,856),(D,458),(R,407),(U,41),(L,930),(D,460),(R,809),(U,467),(L,410),(D,800),(L,135),(D,596),(R,678),(D,4),(L,771),(D,637),(L,876),(U,192),(L,406),(D,136),(R,666),(U,730),(R,711),(D,291),(L,586),(U,845),(R,606),(U,2),(L,228),(D,759),(R,244),(U,946),(R,948),(U,160),(R,397),(U,134),(R,188),(U,850),(R,623),(D,315),(L,219),(D,450),(R,489),(U,374),(R,299),(D,474),(L,767),(D,679),(L,160),(D,403),(L,708)] ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix-ls.output.md b/unison-src/transcripts/fix-ls.output.md index abf280b23..b99f0f587 100644 --- a/unison-src/transcripts/fix-ls.output.md +++ b/unison-src/transcripts/fix-ls.output.md @@ -1,4 +1,4 @@ -```ucm +``` ucm test-ls/main> builtins.merge Done. @@ -10,7 +10,7 @@ foo.bar.add x y = x Int.+ y foo.bar.subtract x y = x Int.- y ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -24,7 +24,7 @@ foo.bar.subtract x y = x Int.- y foo.bar.subtract : Int -> Int -> Int ``` -```ucm +``` ucm test-ls/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/fix1063.output.md b/unison-src/transcripts/fix1063.output.md index ca9f0ad57..57ab0b23d 100644 --- a/unison-src/transcripts/fix1063.output.md +++ b/unison-src/transcripts/fix1063.output.md @@ -8,7 +8,7 @@ use Boolean not noop = not `.` not ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -22,7 +22,7 @@ noop = not `.` not noop : Boolean -> Boolean ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/fix1334.output.md b/unison-src/transcripts/fix1334.output.md index b9b6f6a89..dfadcbe0a 100644 --- a/unison-src/transcripts/fix1334.output.md +++ b/unison-src/transcripts/fix1334.output.md @@ -4,7 +4,7 @@ With this PR, the source of an alias can be a short hash (even of a definition t Let's make some hash-only aliases, now that we can. :mad-with-power-emoji: -```ucm +``` ucm scratch/main> alias.type ##Nat Cat Done. diff --git a/unison-src/transcripts/fix1390.output.md b/unison-src/transcripts/fix1390.output.md index 4d50e86af..340a34e2c 100644 --- a/unison-src/transcripts/fix1390.output.md +++ b/unison-src/transcripts/fix1390.output.md @@ -1,4 +1,4 @@ -```ucm +``` ucm scratch/main> builtins.merge Done. @@ -13,7 +13,7 @@ List.map f = go [] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -26,7 +26,7 @@ List.map f = List.map : (i ->{g} o) -> [i] ->{g} [o] ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -53,7 +53,7 @@ List.map2 f = go [] ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix1532.output.md b/unison-src/transcripts/fix1532.output.md index 41ea7b2b9..0412312d8 100644 --- a/unison-src/transcripts/fix1532.output.md +++ b/unison-src/transcripts/fix1532.output.md @@ -1,4 +1,4 @@ -```ucm +``` ucm scratch/main> builtins.merge Done. @@ -12,7 +12,7 @@ foo.y = 100 bar.z = x + y ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -27,7 +27,7 @@ bar.z = x + y foo.y : Nat ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -39,7 +39,7 @@ scratch/main> add ``` Let's see what we have created... -```ucm +``` ucm scratch/main> ls 1. bar/ (1 term) @@ -49,7 +49,7 @@ scratch/main> ls ``` Now, if we try deleting the namespace `foo`, we get an error, as expected. -```ucm +``` ucm scratch/main> delete.namespace foo ⚠️ @@ -68,7 +68,7 @@ scratch/main> delete.namespace foo ``` Any numbered arguments should refer to `bar.z`. -```ucm +``` ucm scratch/main> debug.numberedArgs 1. bar.z @@ -77,7 +77,7 @@ scratch/main> debug.numberedArgs ``` We can then delete the dependent term, and then delete `foo`. -```ucm +``` ucm scratch/main> delete.term 1 Done. diff --git a/unison-src/transcripts/fix1696.output.md b/unison-src/transcripts/fix1696.output.md index 47c1159a3..772f10e6c 100644 --- a/unison-src/transcripts/fix1696.output.md +++ b/unison-src/transcripts/fix1696.output.md @@ -16,7 +16,7 @@ dialog = Ask.provide 'zoot '("Awesome number: " ++ Nat.toText Ask.ask ++ "!") > dialog ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix1709.output.md b/unison-src/transcripts/fix1709.output.md index 3aacb9753..7159b5b54 100644 --- a/unison-src/transcripts/fix1709.output.md +++ b/unison-src/transcripts/fix1709.output.md @@ -6,7 +6,7 @@ id2 x = id x ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -20,7 +20,7 @@ id2 x = id2 : x -> x ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -33,7 +33,7 @@ scratch/main> add > id2 "hi" ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix1731.output.md b/unison-src/transcripts/fix1731.output.md index 8c8a7610a..be55bbb4b 100644 --- a/unison-src/transcripts/fix1731.output.md +++ b/unison-src/transcripts/fix1731.output.md @@ -12,7 +12,7 @@ repro = cases input -> () ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix1800.output.md b/unison-src/transcripts/fix1800.output.md index 8fb9e9297..97f93ed40 100644 --- a/unison-src/transcripts/fix1800.output.md +++ b/unison-src/transcripts/fix1800.output.md @@ -20,7 +20,7 @@ Testing a few variations here: - Should be able to run annotated and unannotated main functions in the current file. - Should be able to run annotated and unannotated main functions from the codebase. -```ucm +``` ucm scratch/main> run main1 () @@ -57,7 +57,7 @@ scratch/main> rename.term main3 code.main3 ``` The renaming just ensures that when running `code.main1`, it has to get that main from the codebase rather than the scratch file: -```ucm +``` ucm scratch/main> run code.main1 () @@ -83,7 +83,7 @@ main5 _ = () This shouldn't work since `main4` and `main5` don't have the right type. -```ucm +``` ucm scratch/main> run main4 😶 @@ -97,7 +97,7 @@ scratch/main> run main4 main4 : '{IO, Exception} result ``` -```ucm +``` ucm scratch/main> run main5 😶 diff --git a/unison-src/transcripts/fix1844.output.md b/unison-src/transcripts/fix1844.output.md index bbc28208c..0f6f42817 100644 --- a/unison-src/transcripts/fix1844.output.md +++ b/unison-src/transcripts/fix1844.output.md @@ -9,7 +9,7 @@ snoc k aN = match k with > snoc (One 1) 2 ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix1926.output.md b/unison-src/transcripts/fix1926.output.md index 6326666d2..1c940cc22 100644 --- a/unison-src/transcripts/fix1926.output.md +++ b/unison-src/transcripts/fix1926.output.md @@ -1,4 +1,4 @@ -```ucm +``` ucm scratch/main> builtins.merge Done. @@ -10,7 +10,7 @@ scratch/main> builtins.merge sq = 2934892384 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -36,7 +36,7 @@ sq = 2934892384 sq = 2934892384 ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix2026.output.md b/unison-src/transcripts/fix2026.output.md index 5718d9516..254fcb72c 100644 --- a/unison-src/transcripts/fix2026.output.md +++ b/unison-src/transcripts/fix2026.output.md @@ -35,7 +35,7 @@ Exception.unsafeRun! e _ = handle !e with h ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -63,7 +63,7 @@ Exception.unsafeRun! e _ = toException : Either Failure a ->{Exception} a ``` -```ucm +``` ucm scratch/main> run ex () diff --git a/unison-src/transcripts/fix2027.output.md b/unison-src/transcripts/fix2027.output.md index cb959dcc5..3d224d644 100644 --- a/unison-src/transcripts/fix2027.output.md +++ b/unison-src/transcripts/fix2027.output.md @@ -44,7 +44,7 @@ myServer = unsafeRun! '(hello "127.0.0.1" "0") ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -77,7 +77,7 @@ myServer = unsafeRun! '(hello "127.0.0.1" "0") toException : Either Failure a ->{Exception} a ``` -```ucm +``` ucm scratch/main> run myServer 💔💥 diff --git a/unison-src/transcripts/fix2049.output.md b/unison-src/transcripts/fix2049.output.md index 492729b03..a9354446f 100644 --- a/unison-src/transcripts/fix2049.output.md +++ b/unison-src/transcripts/fix2049.output.md @@ -48,7 +48,7 @@ Fold.Stream.fold = !res Universal.== false ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -106,7 +106,7 @@ tests _ = ] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -120,7 +120,7 @@ tests _ = tests : ∀ _. _ ->{IO} [Result] ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/fix2053.output.md b/unison-src/transcripts/fix2053.output.md index 39766e272..ae97366df 100644 --- a/unison-src/transcripts/fix2053.output.md +++ b/unison-src/transcripts/fix2053.output.md @@ -1,4 +1,4 @@ -```ucm +``` ucm scratch/main> display List.map f a -> diff --git a/unison-src/transcripts/fix2156.output.md b/unison-src/transcripts/fix2156.output.md index acad8adb9..4a15b1acc 100644 --- a/unison-src/transcripts/fix2156.output.md +++ b/unison-src/transcripts/fix2156.output.md @@ -8,7 +8,7 @@ sqr n = n * n > sqr ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix2167.output.md b/unison-src/transcripts/fix2167.output.md index 0a5c34eb1..d4e630f59 100644 --- a/unison-src/transcripts/fix2167.output.md +++ b/unison-src/transcripts/fix2167.output.md @@ -15,7 +15,7 @@ R.near1 region loc = match R.near 42 with ls -> R.die () ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix2187.output.md b/unison-src/transcripts/fix2187.output.md index 45fb5de8b..12a1aab7f 100644 --- a/unison-src/transcripts/fix2187.output.md +++ b/unison-src/transcripts/fix2187.output.md @@ -13,7 +13,7 @@ lexicalScopeEx = ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix2231.output.md b/unison-src/transcripts/fix2231.output.md index 5dfb0b791..d0e410477 100644 --- a/unison-src/transcripts/fix2231.output.md +++ b/unison-src/transcripts/fix2231.output.md @@ -20,7 +20,7 @@ foldl f a = cases txt = foldl (Text.++) "" ["a", "b", "c"] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -36,7 +36,7 @@ txt = foldl (Text.++) "" ["a", "b", "c"] txt : Text ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/fix2238.output.md b/unison-src/transcripts/fix2238.output.md index 0133809e1..0958d7182 100644 --- a/unison-src/transcripts/fix2238.output.md +++ b/unison-src/transcripts/fix2238.output.md @@ -6,7 +6,7 @@ structural ability Abort where abort : x ex = {{ @eval{abort} }} ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -18,7 +18,7 @@ ex = {{ @eval{abort} }} ``` This file should also not typecheck - it has a triple backticks block that uses abilities. -```ucm +``` ucm scratch/main> load unison-src/transcripts/fix2238.u Loading changes detected in unison-src/transcripts/fix2238.u. diff --git a/unison-src/transcripts/fix2244.output.md b/unison-src/transcripts/fix2244.output.md index 63ac780c2..2341d1a26 100644 --- a/unison-src/transcripts/fix2244.output.md +++ b/unison-src/transcripts/fix2244.output.md @@ -1,6 +1,6 @@ Ensure closing token is emitted by closing brace in doc eval block. -```ucm +``` ucm scratch/main> load ./unison-src/transcripts/fix2244.u Loading changes detected in diff --git a/unison-src/transcripts/fix2254.output.md b/unison-src/transcripts/fix2254.output.md index 7abb35233..0c60b4dc7 100644 --- a/unison-src/transcripts/fix2254.output.md +++ b/unison-src/transcripts/fix2254.output.md @@ -32,7 +32,7 @@ g = cases We'll make our edits in a new branch. -```ucm +``` ucm scratch/a> add ⍟ I've added these definitions: @@ -65,7 +65,7 @@ unique type A a b c d Let's do the update now, and verify that the definitions all look good and there's nothing `todo`: -```ucm +``` ucm scratch/a2> update.old ⍟ I've updated these names to your new definition: @@ -121,7 +121,7 @@ structural type Rec = { uno : Nat, dos : Nat } combine r = uno r + dos r ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -141,7 +141,7 @@ combine r = uno r + dos r combine : Rec -> Nat ``` -```ucm +``` ucm scratch/r1> add ⍟ I've added these definitions: @@ -167,7 +167,7 @@ scratch/r1> branch r2 structural type Rec = { uno : Nat, dos : Nat, tres : Text } ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -195,7 +195,7 @@ structural type Rec = { uno : Nat, dos : Nat, tres : Text } ``` And checking that after updating this record, there's nothing `todo`: -```ucm +``` ucm scratch/r2> update.old ⍟ I've added these definitions: diff --git a/unison-src/transcripts/fix2268.output.md b/unison-src/transcripts/fix2268.output.md index 1c170dd54..79da65596 100644 --- a/unison-src/transcripts/fix2268.output.md +++ b/unison-src/transcripts/fix2268.output.md @@ -15,7 +15,7 @@ test _ = toNat x ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix2334.output.md b/unison-src/transcripts/fix2334.output.md index 03e65bdcd..ab20adb8e 100644 --- a/unison-src/transcripts/fix2334.output.md +++ b/unison-src/transcripts/fix2334.output.md @@ -14,7 +14,7 @@ f = cases > f 1 1 ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix2344.output.md b/unison-src/transcripts/fix2344.output.md index 4c35e7211..1d5707614 100644 --- a/unison-src/transcripts/fix2344.output.md +++ b/unison-src/transcripts/fix2344.output.md @@ -16,7 +16,7 @@ sneezy dee _ = dee 1 ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix2350.output.md b/unison-src/transcripts/fix2350.output.md index 4fcf50790..5f6f273c3 100644 --- a/unison-src/transcripts/fix2350.output.md +++ b/unison-src/transcripts/fix2350.output.md @@ -24,7 +24,7 @@ save : a ->{Storage d g, g} (d a) save a = !(save.impl a) ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix2353.output.md b/unison-src/transcripts/fix2353.output.md index 72d0c465e..a6a8be6b6 100644 --- a/unison-src/transcripts/fix2353.output.md +++ b/unison-src/transcripts/fix2353.output.md @@ -11,7 +11,7 @@ pure.run a0 a = Scope.run a' ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix2354.output.md b/unison-src/transcripts/fix2354.output.md index 4dab20348..226d20bc5 100644 --- a/unison-src/transcripts/fix2354.output.md +++ b/unison-src/transcripts/fix2354.output.md @@ -8,7 +8,7 @@ f id = id 0 x = 'f ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix2355.output.md b/unison-src/transcripts/fix2355.output.md index 27337dbd6..b162860a9 100644 --- a/unison-src/transcripts/fix2355.output.md +++ b/unison-src/transcripts/fix2355.output.md @@ -19,7 +19,7 @@ example = 'let A.await r ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix2378.output.md b/unison-src/transcripts/fix2378.output.md index 73c63de73..0c63239cc 100644 --- a/unison-src/transcripts/fix2378.output.md +++ b/unison-src/transcripts/fix2378.output.md @@ -38,7 +38,7 @@ x : '{} (Either () Nat) x _ = Ex.catch '(C.pure.run '(A.pure.run ex)) ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix2423.output.md b/unison-src/transcripts/fix2423.output.md index cc17ad15c..40d2fa650 100644 --- a/unison-src/transcripts/fix2423.output.md +++ b/unison-src/transcripts/fix2423.output.md @@ -26,7 +26,7 @@ Split.zipSame sa sb _ = handle !sa with go sb ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix2474.output.md b/unison-src/transcripts/fix2474.output.md index 4a0d8a08e..0daf2d3ba 100644 --- a/unison-src/transcripts/fix2474.output.md +++ b/unison-src/transcripts/fix2474.output.md @@ -16,7 +16,7 @@ should be typed in the following way: Previously this was being checked as `o ->{E0} r`, where `E0` is the ability that contains `e`. -```ucm +``` ucm scratch/main> builtins.merge Done. @@ -35,7 +35,7 @@ Stream.uncons s = handle !s with go ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix2628.output.md b/unison-src/transcripts/fix2628.output.md index cb51cf0d7..87aa68a67 100644 --- a/unison-src/transcripts/fix2628.output.md +++ b/unison-src/transcripts/fix2628.output.md @@ -4,7 +4,7 @@ unique type foo.bar.baz.MyRecord = { } ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/fix2663.output.md b/unison-src/transcripts/fix2663.output.md index fcb73c75d..6153dc042 100644 --- a/unison-src/transcripts/fix2663.output.md +++ b/unison-src/transcripts/fix2663.output.md @@ -18,7 +18,7 @@ bad x = match Some (Some x) with > bad 2 ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix2693.output.md b/unison-src/transcripts/fix2693.output.md index 94961fc9e..e5414c32a 100644 --- a/unison-src/transcripts/fix2693.output.md +++ b/unison-src/transcripts/fix2693.output.md @@ -8,7 +8,7 @@ range : Nat -> List Nat range = loop [] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -22,7 +22,7 @@ range = loop [] range : Nat -> [Nat] ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -35,7 +35,7 @@ scratch/main> add > range 2000 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -2057,7 +2057,7 @@ Should be cached: > range 2000 ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix2712.output.md b/unison-src/transcripts/fix2712.output.md index 04c8c46e3..418123510 100644 --- a/unison-src/transcripts/fix2712.output.md +++ b/unison-src/transcripts/fix2712.output.md @@ -5,7 +5,7 @@ mapWithKey : (k ->{e} a ->{e} b) -> Map k a ->{e} Map k b mapWithKey f m = Tip ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -19,7 +19,7 @@ mapWithKey f m = Tip mapWithKey : (k ->{e} a ->{e} b) -> Map k a ->{e} Map k b ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -40,7 +40,7 @@ naiomi = ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix2795.output.md b/unison-src/transcripts/fix2795.output.md index 09ae558fc..39da527ba 100644 --- a/unison-src/transcripts/fix2795.output.md +++ b/unison-src/transcripts/fix2795.output.md @@ -1,4 +1,4 @@ -```ucm +``` ucm scratch/main> builtins.mergeio Done. diff --git a/unison-src/transcripts/fix2840.output.md b/unison-src/transcripts/fix2840.output.md index a84e33e4d..d6e9c3eef 100644 --- a/unison-src/transcripts/fix2840.output.md +++ b/unison-src/transcripts/fix2840.output.md @@ -2,7 +2,7 @@ This bugfix addresses an issue where embedded Unison code in UCM was expected to First, a few \[hidden\] definitions necessary for typechecking a simple Doc2. -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -25,7 +25,7 @@ Hi }} ``` -```ucm +``` ucm scratch/main> display README Hi diff --git a/unison-src/transcripts/fix2970.output.md b/unison-src/transcripts/fix2970.output.md index 2d4915f4a..7f5bddca1 100644 --- a/unison-src/transcripts/fix2970.output.md +++ b/unison-src/transcripts/fix2970.output.md @@ -1,6 +1,6 @@ Also fixes \#1519 (it's the same issue). -```ucm +``` ucm scratch/main> builtins.merge Done. @@ -11,7 +11,7 @@ foo.+.doc : Nat foo.+.doc = 10 ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix3037.output.md b/unison-src/transcripts/fix3037.output.md index be813afc7..aebd61c50 100644 --- a/unison-src/transcripts/fix3037.output.md +++ b/unison-src/transcripts/fix3037.output.md @@ -13,7 +13,7 @@ runner : Runner {IO} runner = pureRunner ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -47,7 +47,7 @@ h _ = () > h anA ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix3171.output.md b/unison-src/transcripts/fix3171.output.md index 0fdaf8377..8778f0442 100644 --- a/unison-src/transcripts/fix3171.output.md +++ b/unison-src/transcripts/fix3171.output.md @@ -9,7 +9,7 @@ f x y z _ = x + y * z > f 1 2 3 ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix3196.output.md b/unison-src/transcripts/fix3196.output.md index 95f0764c0..3b8f04647 100644 --- a/unison-src/transcripts/fix3196.output.md +++ b/unison-src/transcripts/fix3196.output.md @@ -26,7 +26,7 @@ w2 = cases W -> W > w2 w1 ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix3215.output.md b/unison-src/transcripts/fix3215.output.md index 492d69016..2f5128ffb 100644 --- a/unison-src/transcripts/fix3215.output.md +++ b/unison-src/transcripts/fix3215.output.md @@ -16,7 +16,7 @@ f = cases {x} -> 5 ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix3244.output.md b/unison-src/transcripts/fix3244.output.md index 5eca2f4f7..00899d4c5 100644 --- a/unison-src/transcripts/fix3244.output.md +++ b/unison-src/transcripts/fix3244.output.md @@ -15,7 +15,7 @@ foo t = > foo (10,20) ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix3265.output.md b/unison-src/transcripts/fix3265.output.md index 2db3893b8..1f70863dc 100644 --- a/unison-src/transcripts/fix3265.output.md +++ b/unison-src/transcripts/fix3265.output.md @@ -21,7 +21,7 @@ are three cases that need to be 'fixed up.' g (z -> x + f0 z)) ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -66,7 +66,7 @@ discard its arguments, where `f` also occurs. f x 20) ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix3634.output.md b/unison-src/transcripts/fix3634.output.md index e06cd8fbc..ac92ec60c 100644 --- a/unison-src/transcripts/fix3634.output.md +++ b/unison-src/transcripts/fix3634.output.md @@ -10,7 +10,7 @@ d = {{ }} ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -25,7 +25,7 @@ d = {{ d : Doc2 ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/fix3678.output.md b/unison-src/transcripts/fix3678.output.md index 3b2754bdd..321c493f2 100644 --- a/unison-src/transcripts/fix3678.output.md +++ b/unison-src/transcripts/fix3678.output.md @@ -8,7 +8,7 @@ arr = Scope.run do > compare arr arr ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix3752.output.md b/unison-src/transcripts/fix3752.output.md index fb52acd21..b22b33408 100644 --- a/unison-src/transcripts/fix3752.output.md +++ b/unison-src/transcripts/fix3752.output.md @@ -15,7 +15,7 @@ bar = do id "hello" ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix3759.output.md b/unison-src/transcripts/fix3759.output.md index 4f0db3fe5..1102f4535 100644 --- a/unison-src/transcripts/fix3759.output.md +++ b/unison-src/transcripts/fix3759.output.md @@ -47,7 +47,7 @@ blah.frobnicate = "Yay!" > blah.frobnicate Text.++ " 🎉" ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix3773.output.md b/unison-src/transcripts/fix3773.output.md index e7f355fd0..360dd2578 100644 --- a/unison-src/transcripts/fix3773.output.md +++ b/unison-src/transcripts/fix3773.output.md @@ -7,7 +7,7 @@ foo = > foo + 20 ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix4172.output.md b/unison-src/transcripts/fix4172.output.md index 436f79715..b94add30a 100644 --- a/unison-src/transcripts/fix4172.output.md +++ b/unison-src/transcripts/fix4172.output.md @@ -11,7 +11,7 @@ bool = true allowDebug = debug [1,2,3] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -34,7 +34,7 @@ allowDebug = debug [1,2,3] ✅ Passed Yay ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -59,7 +59,7 @@ scratch/main> test bool = false ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -73,7 +73,7 @@ bool = false bool : Boolean ``` -```ucm +``` ucm scratch/main> update.old ⍟ I've updated these names to your new definition: diff --git a/unison-src/transcripts/fix4280.output.md b/unison-src/transcripts/fix4280.output.md index 4c7fbb2de..65561ba2a 100644 --- a/unison-src/transcripts/fix4280.output.md +++ b/unison-src/transcripts/fix4280.output.md @@ -7,7 +7,7 @@ bonk = _baz ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix4397.output.md b/unison-src/transcripts/fix4397.output.md index 2cb173290..5d62c1227 100644 --- a/unison-src/transcripts/fix4397.output.md +++ b/unison-src/transcripts/fix4397.output.md @@ -7,7 +7,7 @@ unique type Bar = Bar Baz ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix4415.output.md b/unison-src/transcripts/fix4415.output.md index 90d57f289..b17f16ddc 100644 --- a/unison-src/transcripts/fix4415.output.md +++ b/unison-src/transcripts/fix4415.output.md @@ -3,7 +3,7 @@ unique type Foo = Foo unique type sub.Foo = ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix4424.output.md b/unison-src/transcripts/fix4424.output.md index 1eb07ab2d..2c7c4b4b6 100644 --- a/unison-src/transcripts/fix4424.output.md +++ b/unison-src/transcripts/fix4424.output.md @@ -8,7 +8,7 @@ countCat = cases Cat.Dog.Mouse x -> Bird ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -24,7 +24,7 @@ Now I want to add a constructor. unique type Rat.Dog = Bird | Mouse ``` -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/fix4482.output.md b/unison-src/transcripts/fix4482.output.md index 26a73068d..5f641c204 100644 --- a/unison-src/transcripts/fix4482.output.md +++ b/unison-src/transcripts/fix4482.output.md @@ -6,7 +6,7 @@ lib.foo1.lib.bonk2.qux = 1 mybar = bar + bar ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -23,7 +23,7 @@ mybar = bar + bar mybar : Nat ``` -```ucm +``` ucm myproj/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/fix4498.output.md b/unison-src/transcripts/fix4498.output.md index 149d3406f..49cc9735f 100644 --- a/unison-src/transcripts/fix4498.output.md +++ b/unison-src/transcripts/fix4498.output.md @@ -5,7 +5,7 @@ lib.dep0.lib.dep1.foo = 6 myterm = foo + 2 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -21,7 +21,7 @@ myterm = foo + 2 myterm : Nat ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/fix4515.output.md b/unison-src/transcripts/fix4515.output.md index 925195662..9e4b3ee65 100644 --- a/unison-src/transcripts/fix4515.output.md +++ b/unison-src/transcripts/fix4515.output.md @@ -8,7 +8,7 @@ useBar = cases Bar.X _ -> 1 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -24,7 +24,7 @@ useBar = cases useBar : Bar -> Nat ``` -```ucm +``` ucm myproject/main> add ⍟ I've added these definitions: @@ -39,7 +39,7 @@ myproject/main> add unique type Foo = Foo1 | Foo2 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -53,7 +53,7 @@ unique type Foo = Foo1 | Foo2 type Foo ``` -```ucm +``` ucm myproject/main> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/fix4528.output.md b/unison-src/transcripts/fix4528.output.md index 8b2d96fc3..0266eef0a 100644 --- a/unison-src/transcripts/fix4528.output.md +++ b/unison-src/transcripts/fix4528.output.md @@ -5,7 +5,7 @@ main : () -> Foo main _ = MkFoo 5 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -19,7 +19,7 @@ main _ = MkFoo 5 main : 'Foo ``` -```ucm +``` ucm foo/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/fix4556.output.md b/unison-src/transcripts/fix4556.output.md index f36c030d2..23bdc3a9f 100644 --- a/unison-src/transcripts/fix4556.output.md +++ b/unison-src/transcripts/fix4556.output.md @@ -5,7 +5,7 @@ bar.hello = 5 + thing hey = foo.hello ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -21,7 +21,7 @@ hey = foo.hello thing : Nat ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -36,7 +36,7 @@ scratch/main> add thing = 2 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -50,7 +50,7 @@ thing = 2 thing : Nat ``` -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/fix4592.output.md b/unison-src/transcripts/fix4592.output.md index 1644f6c33..a6a05b76d 100644 --- a/unison-src/transcripts/fix4592.output.md +++ b/unison-src/transcripts/fix4592.output.md @@ -3,7 +3,7 @@ doc = {{ {{ bug "bug" 52 }} }} ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix4618.output.md b/unison-src/transcripts/fix4618.output.md index 144c13a8d..a364ddc8f 100644 --- a/unison-src/transcripts/fix4618.output.md +++ b/unison-src/transcripts/fix4618.output.md @@ -3,7 +3,7 @@ foo = 5 unique type Bugs.Zonk = Bugs ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -17,7 +17,7 @@ unique type Bugs.Zonk = Bugs foo : Nat ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -31,7 +31,7 @@ foo = 4 unique type Bugs = ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -49,7 +49,7 @@ unique type Bugs = foo : Nat ``` -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/fix4722.output.md b/unison-src/transcripts/fix4722.output.md index 91b071e5f..faa963b19 100644 --- a/unison-src/transcripts/fix4722.output.md +++ b/unison-src/transcripts/fix4722.output.md @@ -34,7 +34,7 @@ foo = cases f (_ -> ()) (foo l) (foo r) ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix4780.output.md b/unison-src/transcripts/fix4780.output.md index 392060c34..5fefbd4cc 100644 --- a/unison-src/transcripts/fix4780.output.md +++ b/unison-src/transcripts/fix4780.output.md @@ -5,7 +5,7 @@ builtins decompile properly. > (+) 2 ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix4898.output.md b/unison-src/transcripts/fix4898.output.md index 62c4d6377..9bacabb90 100644 --- a/unison-src/transcripts/fix4898.output.md +++ b/unison-src/transcripts/fix4898.output.md @@ -1,4 +1,4 @@ -```ucm +``` ucm scratch/main> builtins.merge Done. @@ -12,7 +12,7 @@ redouble : Int -> Int redouble x = double x + double x ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -26,7 +26,7 @@ redouble x = double x + double x redouble : Int -> Int ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/fix5055.output.md b/unison-src/transcripts/fix5055.output.md index 475edc5bd..005e47585 100644 --- a/unison-src/transcripts/fix5055.output.md +++ b/unison-src/transcripts/fix5055.output.md @@ -1,4 +1,4 @@ -```ucm +``` ucm test-5055/main> builtins.merge Done. @@ -10,7 +10,7 @@ foo.add x y = x Int.+ y foo.subtract x y = x Int.- y ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -24,7 +24,7 @@ foo.subtract x y = x Int.- y foo.subtract : Int -> Int -> Int ``` -```ucm +``` ucm test-5055/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/fix5080.output.md b/unison-src/transcripts/fix5080.output.md index 67468e1b8..f64f9c84f 100644 --- a/unison-src/transcripts/fix5080.output.md +++ b/unison-src/transcripts/fix5080.output.md @@ -3,7 +3,7 @@ test> fix5080.tests.success = [Ok "success"] test> fix5080.tests.failure = [Fail "fail"] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -28,7 +28,7 @@ test> fix5080.tests.failure = [Fail "fail"] 🚫 FAILED fail ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -49,7 +49,7 @@ scratch/main> test Tip: Use view 1 to view the source of a test. ``` -```ucm +``` ucm scratch/main> delete.term 2 Done. diff --git a/unison-src/transcripts/fix614.output.md b/unison-src/transcripts/fix614.output.md index 770489a09..97ec65e00 100644 --- a/unison-src/transcripts/fix614.output.md +++ b/unison-src/transcripts/fix614.output.md @@ -11,7 +11,7 @@ ex1 = do 42 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -33,7 +33,7 @@ ex2 = do 42 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -55,7 +55,7 @@ ex3 = do () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -78,7 +78,7 @@ ex4 = () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -100,7 +100,7 @@ ex4 = () ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix689.output.md b/unison-src/transcripts/fix689.output.md index 06689cf64..ed8ea0410 100644 --- a/unison-src/transcripts/fix689.output.md +++ b/unison-src/transcripts/fix689.output.md @@ -7,7 +7,7 @@ structural ability SystemTime where tomorrow = '(SystemTime.systemTime + 24 * 60 * 60) ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix693.output.md b/unison-src/transcripts/fix693.output.md index 753e434f2..35e07bec5 100644 --- a/unison-src/transcripts/fix693.output.md +++ b/unison-src/transcripts/fix693.output.md @@ -6,7 +6,7 @@ structural ability Abort where abort : a ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -20,7 +20,7 @@ structural ability Abort where structural ability X t ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -41,7 +41,7 @@ h0 req = match req with { d } -> Some d ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -69,7 +69,7 @@ h1 req = match req with { d } -> Some d ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -98,7 +98,7 @@ h2 req = match req with { r } -> r ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -121,7 +121,7 @@ h3 = cases { X.x b _ -> _ } -> Some b ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix845.output.md b/unison-src/transcripts/fix845.output.md index 6b910d67e..c192583c6 100644 --- a/unison-src/transcripts/fix845.output.md +++ b/unison-src/transcripts/fix845.output.md @@ -8,7 +8,7 @@ Text.zonk : Text -> Text Text.zonk txt = txt ++ "!! " ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -29,7 +29,7 @@ Now, typecheck a file with a reference to `Blah.zonk` (which doesn't exist in th > Blah.zonk [1,2,3] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -61,7 +61,7 @@ ex = baz ++ ", world!" > ex ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -91,7 +91,7 @@ ex = zonk "hi" > ex ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -123,7 +123,7 @@ ex = zonk "hi" -- should resolve to Text.zonk, from the codebase > ex ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix849.output.md b/unison-src/transcripts/fix849.output.md index f1775f630..c6c5c1390 100644 --- a/unison-src/transcripts/fix849.output.md +++ b/unison-src/transcripts/fix849.output.md @@ -6,7 +6,7 @@ x = 42 > x ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/fix942.output.md b/unison-src/transcripts/fix942.output.md index 13d68377a..13dd97532 100644 --- a/unison-src/transcripts/fix942.output.md +++ b/unison-src/transcripts/fix942.output.md @@ -6,7 +6,7 @@ y = x + 1 z = y + 2 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -21,7 +21,7 @@ z = y + 2 z : Nat ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -37,7 +37,7 @@ Now we edit `x` to be `7`, which should make `z` equal `10`: x = 7 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -51,7 +51,7 @@ x = 7 x : Nat ``` -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be @@ -85,7 +85,7 @@ Uh oh\! `z` is still referencing the old version. Just to confirm: test> t1 = if z == 3 then [Fail "nooo!!!"] else [Ok "great"] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -105,7 +105,7 @@ test> t1 = if z == 3 then [Fail "nooo!!!"] else [Ok "great"] ✅ Passed great ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/fix987.output.md b/unison-src/transcripts/fix987.output.md index e816b3808..a128fa6c0 100644 --- a/unison-src/transcripts/fix987.output.md +++ b/unison-src/transcripts/fix987.output.md @@ -10,7 +10,7 @@ spaceAttack1 x = "All done" ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -26,7 +26,7 @@ spaceAttack1 x = ``` Add it to the codebase: -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -44,7 +44,7 @@ spaceAttack2 x = "All done" ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -57,7 +57,7 @@ spaceAttack2 x = spaceAttack2 : x ->{DeathStar} Text ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/formatter.output.md b/unison-src/transcripts/formatter.output.md index 1b16b7def..54c9a1232 100644 --- a/unison-src/transcripts/formatter.output.md +++ b/unison-src/transcripts/formatter.output.md @@ -83,7 +83,7 @@ with a strike-through block~ }} ``` -```ucm +``` ucm scratch/main> debug.format ``` @@ -171,7 +171,7 @@ Formatter should leave things alone if the file doesn't typecheck. brokenDoc = {{ hello }} + 1 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -199,7 +199,7 @@ brokenDoc = {{ hello }} + 1 (Nat.+) : Nat -> Nat -> Nat ``` -```ucm +``` ucm scratch/main> debug.format ``` diff --git a/unison-src/transcripts/fuzzy-options.output.md b/unison-src/transcripts/fuzzy-options.output.md index f07d39906..d83fd4341 100644 --- a/unison-src/transcripts/fuzzy-options.output.md +++ b/unison-src/transcripts/fuzzy-options.output.md @@ -2,7 +2,7 @@ If an argument is required but doesn't have a fuzzy resolver, the command should just print the help. -```ucm +``` ucm -- The second argument of move.term is a 'new-name' and doesn't have a fuzzy resolver scratch/main> move.term @@ -12,7 +12,7 @@ scratch/main> move.term If a fuzzy resolver doesn't have any options available it should print a message instead of opening an empty fuzzy-select. -```ucm +``` ucm scratch/empty> view ⚠️ @@ -28,7 +28,7 @@ nested.optionTwo = 2 Definition args -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -45,7 +45,7 @@ scratch/main> debug.fuzzy-options view _ ``` Namespace args -```ucm +``` ucm scratch/main> add ⊡ Ignored previously added definitions: nested.optionTwo @@ -59,7 +59,7 @@ scratch/main> debug.fuzzy-options find-in _ ``` Project Branch args -```ucm +``` ucm myproject/main> branch mybranch Done. I've created the mybranch branch based off of main. diff --git a/unison-src/transcripts/generic-parse-errors.output.md b/unison-src/transcripts/generic-parse-errors.output.md index b0f6d6a5b..c66d0c594 100644 --- a/unison-src/transcripts/generic-parse-errors.output.md +++ b/unison-src/transcripts/generic-parse-errors.output.md @@ -5,7 +5,7 @@ x = foo.123 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -26,7 +26,7 @@ x = namespace.blah = 1 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -42,7 +42,7 @@ namespace.blah = 1 x = 1 ] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -56,7 +56,7 @@ x = 1 ] x = a.#abc ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -72,7 +72,7 @@ x = a.#abc x = "hi ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -93,7 +93,7 @@ x = "hi y : a ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/hello.output.md b/unison-src/transcripts/hello.output.md index 3c5d9bc8c..720cd6d3f 100644 --- a/unison-src/transcripts/hello.output.md +++ b/unison-src/transcripts/hello.output.md @@ -27,7 +27,7 @@ x = 42 ``` -```ucm +``` ucm Loading changes detected in myfile.u. @@ -42,7 +42,7 @@ x = 42 ``` Let's go ahead and add that to the codebase, then make sure it's there: -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -78,7 +78,7 @@ hmm : .builtin.Nat hmm = "Not, in fact, a number" ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/help.output.md b/unison-src/transcripts/help.output.md index 54662d0c9..019bc3092 100644 --- a/unison-src/transcripts/help.output.md +++ b/unison-src/transcripts/help.output.md @@ -1,6 +1,6 @@ # Shows `help` output -```ucm +``` ucm scratch/main> help add diff --git a/unison-src/transcripts/higher-rank.output.md b/unison-src/transcripts/higher-rank.output.md index f4c2dbf50..449617d84 100644 --- a/unison-src/transcripts/higher-rank.output.md +++ b/unison-src/transcripts/higher-rank.output.md @@ -9,7 +9,7 @@ f id = (id 1, id "hi") > f (x -> x) ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -38,7 +38,7 @@ f id _ = () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -66,7 +66,7 @@ Functor.blah = cases Functor f -> () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -110,7 +110,7 @@ Loc.transform2 nt = cases Loc f -> Loc f' ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -139,7 +139,7 @@ structural type HigherRanked = HigherRanked (forall a. a -> a) We should be able to add and view records with higher-rank fields. -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/input-parse-errors.output.md b/unison-src/transcripts/input-parse-errors.output.md index 2e00b284c..f349b8a88 100644 --- a/unison-src/transcripts/input-parse-errors.output.md +++ b/unison-src/transcripts/input-parse-errors.output.md @@ -6,7 +6,7 @@ x = 55 `handleNameArg` parse error in `add` -```ucm +``` ucm scratch/main> add . ⚠️ @@ -61,7 +61,7 @@ todo: aliasMany: skipped -- similar to `add` -```ucm +``` ucm scratch/main> update arg ⚠️ diff --git a/unison-src/transcripts/io-test-command.output.md b/unison-src/transcripts/io-test-command.output.md index 65abcdab6..0e1d8cbbd 100644 --- a/unison-src/transcripts/io-test-command.output.md +++ b/unison-src/transcripts/io-test-command.output.md @@ -17,7 +17,7 @@ lib.ioAndExceptionTestInLib = do Run a IO tests one by one -```ucm +``` ucm scratch/main> io.test ioAndExceptionTest New test results: @@ -41,7 +41,7 @@ scratch/main> io.test ioTest ``` `io.test` doesn't cache results -```ucm +``` ucm scratch/main> io.test ioAndExceptionTest New test results: @@ -55,7 +55,7 @@ scratch/main> io.test ioAndExceptionTest ``` `io.test.all` will run all matching tests except those in the `lib` namespace. -```ucm +``` ucm scratch/main> io.test.all diff --git a/unison-src/transcripts/io.output.md b/unison-src/transcripts/io.output.md index 2cdaeea0e..ef385d897 100644 --- a/unison-src/transcripts/io.output.md +++ b/unison-src/transcripts/io.output.md @@ -45,7 +45,7 @@ testCreateRename _ = runTest test ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -58,7 +58,7 @@ testCreateRename _ = testCreateRename : '{IO} [Result] ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -127,7 +127,7 @@ testOpenClose _ = runTest test ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -140,7 +140,7 @@ testOpenClose _ = testOpenClose : '{IO} [Result] ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -217,7 +217,7 @@ testGetSomeBytes _ = runTest test ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -230,7 +230,7 @@ testGetSomeBytes _ = testGetSomeBytes : '{IO} [Result] ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -324,7 +324,7 @@ testAppend _ = runTest test ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -338,7 +338,7 @@ testAppend _ = testSeek : '{IO} [Result] ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -385,7 +385,7 @@ testSystemTime _ = runTest test ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -398,7 +398,7 @@ testSystemTime _ = testSystemTime : '{IO} [Result] ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -428,7 +428,7 @@ testGetTempDirectory _ = runTest test ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -459,7 +459,7 @@ testGetCurrentDirectory _ = runTest test ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -492,7 +492,7 @@ testDirContents _ = runTest test ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -525,7 +525,7 @@ testGetEnv _ = runTest test ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -580,7 +580,7 @@ testGetArgs.runMeWithTwoArgs = 'let Test that they can be run with the right number of args. -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -605,7 +605,7 @@ scratch/main> run runMeWithTwoArgs foo bar ``` Calling our examples with the wrong number of args will error. -```ucm +``` ucm scratch/main> run runMeWithNoArgs foo 💔💥 @@ -618,7 +618,7 @@ scratch/main> run runMeWithNoArgs foo ##raise ``` -```ucm +``` ucm scratch/main> run runMeWithOneArg 💔💥 @@ -631,7 +631,7 @@ scratch/main> run runMeWithOneArg ##raise ``` -```ucm +``` ucm scratch/main> run runMeWithOneArg foo bar 💔💥 @@ -645,7 +645,7 @@ scratch/main> run runMeWithOneArg foo bar ##raise ``` -```ucm +``` ucm scratch/main> run runMeWithTwoArgs 💔💥 @@ -667,7 +667,7 @@ testTimeZone = do () ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -690,7 +690,7 @@ testRandom = do runTest test ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/kind-inference.output.md b/unison-src/transcripts/kind-inference.output.md index 46a335a20..c40961bc7 100644 --- a/unison-src/transcripts/kind-inference.output.md +++ b/unison-src/transcripts/kind-inference.output.md @@ -6,7 +6,7 @@ conflicting constraints on the kind of `a` in a product unique type T a = T a (a Nat) ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -24,7 +24,7 @@ unique type T a | StarStar (a Nat) ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -44,7 +44,7 @@ unique type Ping a = Ping Pong unique type Pong = Pong (Ping Optional) ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -66,7 +66,7 @@ unique type Ping a = Ping a Pong unique type Pong = Pong (Ping Optional) ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -85,7 +85,7 @@ unique ability Pong a where pong : Ping Optional -> () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -107,7 +107,7 @@ unique ability Pong a where pong : Ping Optional -> () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -126,7 +126,7 @@ unique type T a = T a unique type S = S (T Nat) ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -150,7 +150,7 @@ unique type T a = T unique type S = S (T Optional) ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -172,7 +172,7 @@ unique type T a = T a unique type S = S (T Optional) ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -192,7 +192,7 @@ test : Nat Nat test = 0 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -210,7 +210,7 @@ test : Optional -> () test _ = () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -230,7 +230,7 @@ test : T Nat -> () test _ = () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -254,7 +254,7 @@ test _ = () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -277,7 +277,7 @@ test : Foo -> () test _ = () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -295,7 +295,7 @@ test : {Nat} () test _ = () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -313,7 +313,7 @@ test _ = () unique type T a = T (a a) ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -329,7 +329,7 @@ unique type T a = T (a a) unique type T a b = T (a b) (b a) ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -346,7 +346,7 @@ unique type Ping a = Ping (a Pong) unique type Pong a = Pong (a Ping) ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/lambdacase.output.md b/unison-src/transcripts/lambdacase.output.md index 86fd5b234..c7c6e01c2 100644 --- a/unison-src/transcripts/lambdacase.output.md +++ b/unison-src/transcripts/lambdacase.output.md @@ -8,7 +8,7 @@ isEmpty x = match x with _ -> false ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -29,7 +29,7 @@ isEmpty2 = cases _ -> false ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -45,7 +45,7 @@ isEmpty2 = cases ``` Notice that Unison detects this as an alias of `isEmpty`, and if we view `isEmpty` -```ucm +``` ucm scratch/main> view isEmpty isEmpty : [t] -> Boolean @@ -70,7 +70,7 @@ merge xs ys = match (xs, ys) with else h2 +: merge (h +: t) t2 ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -90,7 +90,7 @@ merge2 = cases else h2 +: merge2 (h +: t) t2 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -106,7 +106,7 @@ merge2 = cases ``` Notice that Unison detects this as an alias of `merge`, and if we view `merge` -```ucm +``` ucm scratch/main> view merge merge : [a] -> [a] -> [a] @@ -139,7 +139,7 @@ blorf = cases > blorf T F ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -180,7 +180,7 @@ merge3 = cases | otherwise -> h2 +: merge3 (h +: t) t2 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -193,7 +193,7 @@ merge3 = cases merge3 : [a] -> [a] -> [a] ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -222,7 +222,7 @@ merge4 a b = match (a,b) with h +: t, h2 +: t2 | otherwise -> h2 +: merge4 (h +: t) t2 ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/lsp-fold-ranges.output.md b/unison-src/transcripts/lsp-fold-ranges.output.md index f2af4461b..46e0a9c76 100644 --- a/unison-src/transcripts/lsp-fold-ranges.output.md +++ b/unison-src/transcripts/lsp-fold-ranges.output.md @@ -23,7 +23,7 @@ test> z = let [Ok (x ++ y)] ``` -```ucm +``` ucm scratch/main> debug.lsp.fold-ranges 《{{ Type doc }}》 diff --git a/unison-src/transcripts/lsp-name-completion.output.md b/unison-src/transcripts/lsp-name-completion.output.md index 0b57f6a98..9c310ea87 100644 --- a/unison-src/transcripts/lsp-name-completion.output.md +++ b/unison-src/transcripts/lsp-name-completion.output.md @@ -17,7 +17,7 @@ sorted by number of name segments, shortest first. Individual LSP clients may still handle sorting differently, e.g. doing a fuzzy match over returned results, or prioritizing exact matches over partial matches. We don't have any control over that. -```ucm +``` ucm scratch/main> debug.lsp-name-completion foldMap Matching Path Name Hash @@ -30,7 +30,7 @@ scratch/main> debug.lsp-name-completion foldMap ``` Should still find the term which has a matching hash to a better name if the better name doesn't match. -```ucm +``` ucm scratch/main> debug.lsp-name-completion transitive_same_hash.foldMap Matching Path Name Hash diff --git a/unison-src/transcripts/merge.output.md b/unison-src/transcripts/merge.output.md index d67d0355b..77350b113 100644 --- a/unison-src/transcripts/merge.output.md +++ b/unison-src/transcripts/merge.output.md @@ -3,7 +3,7 @@ The `merge` command merges together two branches in the same project: the current branch (unspecificed), and the target branch. For example, to merge `topic` into `main`, switch to `main` and run `merge topic`: -```ucm +``` ucm scratch/main> help merge merge @@ -45,7 +45,7 @@ bar = "bobs bar" Merge result: -```ucm +``` ucm project/alice> merge /bob I merged project/bob into project/alice. @@ -82,7 +82,7 @@ bar = "bobs bar" Merge result: -```ucm +``` ucm project/alice> merge /bob I merged project/bob into project/alice. @@ -121,7 +121,7 @@ bar : Text bar = foo ++ " - " ++ foo ``` -```ucm +``` ucm project/bob> display bar "old foo - old foo" @@ -129,7 +129,7 @@ project/bob> display bar ``` Merge result: -```ucm +``` ucm project/alice> merge /bob I merged project/bob into project/alice. @@ -175,7 +175,7 @@ bar : Text bar = "alices bar" ``` -```ucm +``` ucm project/alice> display foo "foo - alices bar - old baz" @@ -188,7 +188,7 @@ baz : Text baz = "bobs baz" ``` -```ucm +``` ucm project/bob> display foo "foo - old bar - bobs baz" @@ -196,7 +196,7 @@ project/bob> display foo ``` Merge result: -```ucm +``` ucm project/alice> merge /bob I merged project/bob into project/alice. @@ -236,7 +236,7 @@ baz : Text baz = "old baz" ``` -```ucm +``` ucm project/main> display foo "old foo - old bar - old baz" @@ -249,7 +249,7 @@ baz : Text baz = "alices baz" ``` -```ucm +``` ucm project/alice> display foo "old foo - old bar - alices baz" @@ -262,7 +262,7 @@ bar : Text bar = "bobs bar" ++ " - " ++ baz ``` -```ucm +``` ucm project/bob> display foo "old foo - bobs bar - old baz" @@ -270,7 +270,7 @@ project/bob> display foo ``` Merge result: -```ucm +``` ucm project/alice> merge /bob I merged project/bob into project/alice. @@ -315,7 +315,7 @@ foo = "alices foo" Bob's changes: -```ucm +``` ucm project/bob> delete.term foo Done. @@ -323,7 +323,7 @@ project/bob> delete.term foo ``` Merge result: -```ucm +``` ucm project/alice> merge /bob I merged project/bob into project/alice. @@ -368,7 +368,7 @@ lib.bothDifferent.baz = 21 Merge result: -```ucm +``` ucm project/alice> merge bob I merged project/bob into project/alice. @@ -395,7 +395,7 @@ project/alice> view foo bar baz If Bob is equals Alice, then merging Bob into Alice looks like this. -```ucm +``` ucm project/main> branch alice Done. I've created the alice branch based off of main. @@ -421,7 +421,7 @@ project/alice> merge /bob If Bob is behind Alice, then merging Bob into Alice looks like this. -```ucm +``` ucm project/main> branch alice Done. I've created the alice branch based off of main. @@ -444,7 +444,7 @@ foo : Text foo = "foo" ``` -```ucm +``` ucm project/alice> add ⍟ I've added these definitions: @@ -462,7 +462,7 @@ project/alice> merge /bob If Bob is ahead of Alice, then merging Bob into Alice looks like this. -```ucm +``` ucm project/main> branch alice Done. I've created the alice branch based off of main. @@ -485,7 +485,7 @@ foo : Text foo = "foo" ``` -```ucm +``` ucm project/bob> add ⍟ I've added these definitions: @@ -499,7 +499,7 @@ project/alice> merge /bob ``` ## No-op merge: merge empty namespace into empty namespace -```ucm +``` ucm project/main> branch topic Done. I've created the topic branch based off of main. @@ -531,7 +531,7 @@ foo = "foo" Alice's delete: -```ucm +``` ucm project/alice> delete.term foo Done. @@ -544,7 +544,7 @@ bar : Text bar = foo ++ " - " ++ foo ``` -```ucm +``` ucm project/bob> add ⍟ I've added these definitions: @@ -605,7 +605,7 @@ bar : Text bar = foo ++ " - " ++ foo ``` -```ucm +``` ucm project/alice> merge /bob I couldn't automatically merge project/bob into project/alice. @@ -671,7 +671,7 @@ baz : Text baz = "bobs baz" ``` -```ucm +``` ucm project/alice> merge /bob I couldn't automatically merge project/bob into project/alice. @@ -710,7 +710,7 @@ qux = ``` -```ucm +``` ucm project/merge-bob-into-alice> view bar baz bar : Text @@ -742,7 +742,7 @@ Bob's changes: unique type Foo = MkFoo Nat Text ``` -```ucm +``` ucm project/alice> merge /bob I couldn't automatically merge project/bob into project/alice. @@ -793,7 +793,7 @@ Bob's renames `Qux` to `BobQux`: unique type Foo = Baz Nat | BobQux Text ``` -```ucm +``` ucm project/alice> merge /bob I couldn't automatically merge project/bob into project/alice. @@ -834,7 +834,7 @@ unique type Foo = Baz Nat | Qux Text Alice's rename: -```ucm +``` ucm project/alice> move.term Foo.Baz Foo.Alice Done. @@ -842,13 +842,13 @@ project/alice> move.term Foo.Baz Foo.Alice ``` Bob's rename: -```ucm +``` ucm project/bob> move.term Foo.Qux Foo.Bob Done. ``` -```ucm +``` ucm project/alice> merge bob I couldn't automatically merge project/bob into project/alice. @@ -895,7 +895,7 @@ unique ability my.cool where thing : Nat -> Nat ``` -```ucm +``` ucm project/alice> merge bob I couldn't automatically merge project/bob into project/alice. @@ -944,7 +944,7 @@ unique type Foo = Alice Nat Bob adds the type `Foo` with constructor `Foo.Bar`, replacing the original `Foo.Bar` term: -```ucm +``` ucm project/bob> delete.term Foo.Bar Done. @@ -956,7 +956,7 @@ unique type Foo = Bar Nat Nat These won't cleanly merge. -```ucm +``` ucm project/alice> merge bob I couldn't automatically merge project/bob into project/alice. @@ -1004,7 +1004,7 @@ Foo.Bar.Hello = 17 Alice deletes this type entirely, and repurposes its constructor names for other terms. She also updates the term. -```ucm +``` ucm project/alice> view Foo.Bar.Baz Foo.Bar.Qux Foo.Bar.Hello Foo.Bar.Baz : Nat @@ -1019,7 +1019,7 @@ project/alice> view Foo.Bar.Baz Foo.Bar.Qux Foo.Bar.Hello ``` Bob, meanwhile, first deletes the term, then sort of deletes the type and re-adds it under another name, but one constructor's fully qualified names doesn't actually change. The other constructor reuses the name of the deleted term. -```ucm +``` ucm project/bob> view Foo.Bar type Foo.Bar = Baz Nat | Hello Nat Nat @@ -1029,7 +1029,7 @@ At this point, Bob and alice have both updated the name `Foo.Bar.Hello` in diffe Notably, Alice's "unconflicted" update on the name "Foo.Bar.Baz" (because she changed its hash and Bob didn't touch it) is nonetheless considered conflicted with Bob's "Foo.Bar.Baz". -```ucm +``` ucm project/alice> merge bob I couldn't automatically merge project/bob into project/alice. @@ -1089,7 +1089,7 @@ bob : Foo -> Nat bob _ = 19 ``` -```ucm +``` ucm project/alice> merge bob I couldn't automatically merge project/bob into project/alice. @@ -1157,7 +1157,7 @@ foo = "bobs foo" Attempt to merge: -```ucm +``` ucm project/alice> merge /bob I couldn't automatically merge project/bob into project/alice. @@ -1195,7 +1195,7 @@ foo : Text foo = "alice and bobs foo" ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -1208,7 +1208,7 @@ foo = "alice and bobs foo" foo : Text ``` -```ucm +``` ucm project/merge-bob-into-alice> update Okay, I'm searching the branch for code that needs to be @@ -1238,7 +1238,7 @@ project/alice> branches `merge.commit` can only be run on a "merge branch". -```ucm +``` ucm project/main> branch topic Done. I've created the topic branch based off of main. @@ -1247,7 +1247,7 @@ project/main> branch topic `switch /main` then `merge /topic`. ``` -```ucm +``` ucm project/topic> merge.commit It doesn't look like there's a merge in progress. @@ -1288,7 +1288,7 @@ baz : Text baz = "baz" ``` -```ucm +``` ucm project/alice> merge /bob Sorry, I wasn't able to perform the merge: @@ -1318,7 +1318,7 @@ One way to fix this in the future would be to introduce a syntax for defining al Alice's branch: -```ucm +``` ucm project/alice> alias.type lib.builtins.Nat MyNat Done. @@ -1330,7 +1330,7 @@ Bob's branch: unique type MyNat = MyNat Nat ``` -```ucm +``` ucm project/alice> merge /bob Sorry, I wasn't able to perform the merge: @@ -1354,7 +1354,7 @@ Alice's branch: unique type Foo = Bar ``` -```ucm +``` ucm project/alice> alias.term Foo.Bar Foo.some.other.Alias Done. @@ -1367,7 +1367,7 @@ bob : Nat bob = 100 ``` -```ucm +``` ucm project/alice> merge /bob Sorry, I wasn't able to perform the merge: @@ -1392,7 +1392,7 @@ Alice's branch: unique type Foo = Bar ``` -```ucm +``` ucm project/alice> delete.term Foo.Bar Done. @@ -1405,7 +1405,7 @@ bob : Nat bob = 100 ``` -```ucm +``` ucm project/alice> merge /bob Sorry, I wasn't able to perform the merge: @@ -1429,7 +1429,7 @@ structural type A = B Nat | C Nat Nat structural type A.inner.X = Y Nat | Z Nat Nat ``` -```ucm +``` ucm project/alice> names A Type @@ -1446,7 +1446,7 @@ bob : Nat bob = 100 ``` -```ucm +``` ucm project/alice> merge /bob On project/alice, the type A.inner.X is an alias of A. I'm not @@ -1461,7 +1461,7 @@ Constructors may only exist within the corresponding decl's namespace. Alice's branch: -```ucm +``` ucm project/alice> add ⍟ I've added these definitions: @@ -1475,7 +1475,7 @@ project/alice> alias.term Foo.Bar AliasOutsideFooNamespace ``` Bob's branch: -```ucm +``` ucm project/bob> add ⍟ I've added these definitions: @@ -1483,7 +1483,7 @@ project/bob> add bob : Nat ``` -```ucm +``` ucm project/alice> merge bob Sorry, I wasn't able to perform the merge, because I need all @@ -1514,7 +1514,7 @@ bob : Nat bob = 100 ``` -```ucm +``` ucm project/alice> merge /bob Sorry, I wasn't able to perform the merge: @@ -1539,7 +1539,7 @@ LCA: structural type Foo = Bar Nat | Baz Nat Nat ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -1552,7 +1552,7 @@ structural type Foo = Bar Nat | Baz Nat Nat structural type Foo ``` -```ucm +``` ucm project/main> add ⍟ I've added these definitions: @@ -1566,7 +1566,7 @@ project/main> delete.term Foo.Baz ``` Alice's branch: -```ucm +``` ucm project/main> branch alice Done. I've created the alice branch based off of main. @@ -1588,7 +1588,7 @@ alice : Nat alice = 100 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -1601,7 +1601,7 @@ alice = 100 alice : Nat ``` -```ucm +``` ucm project/alice> add ⍟ I've added these definitions: @@ -1611,7 +1611,7 @@ project/alice> add ``` Bob's branch: -```ucm +``` ucm project/main> branch bob Done. I've created the bob branch based off of main. @@ -1633,7 +1633,7 @@ bob : Nat bob = 101 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -1646,7 +1646,7 @@ bob = 101 bob : Nat ``` -```ucm +``` ucm project/bob> add ⍟ I've added these definitions: @@ -1656,7 +1656,7 @@ project/bob> add ``` Now we merge: -```ucm +``` ucm project/alice> merge /bob I merged project/bob into project/alice. @@ -1671,7 +1671,7 @@ foo = 17 bar = 17 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -1685,7 +1685,7 @@ bar = 17 foo : Nat ``` -```ucm +``` ucm project/main> add ⍟ I've added these definitions: @@ -1709,7 +1709,7 @@ project/alice> delete.term bar foo = 18 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -1723,7 +1723,7 @@ foo = 18 foo : Nat ``` -```ucm +``` ucm project/alice> update Okay, I'm searching the branch for code that needs to be @@ -1743,7 +1743,7 @@ project/main> branch bob bob = 101 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -1756,7 +1756,7 @@ bob = 101 bob : Nat ``` -```ucm +``` ucm project/bob> add ⍟ I've added these definitions: @@ -1764,7 +1764,7 @@ project/bob> add bob : Nat ``` -```ucm +``` ucm project/alice> merge /bob I merged project/bob into project/alice. @@ -1776,7 +1776,7 @@ project/alice> merge /bob type Foo = Bar | Baz ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -1789,7 +1789,7 @@ type Foo = Bar | Baz type Foo ``` -```ucm +``` ucm project/main> add ⍟ I've added these definitions: @@ -1808,7 +1808,7 @@ project/main> branch topic boop = "boop" ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -1821,7 +1821,7 @@ boop = "boop" boop : Text ``` -```ucm +``` ucm project/topic> add ⍟ I've added these definitions: @@ -1833,7 +1833,7 @@ project/topic> add type Foo = Bar ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -1847,7 +1847,7 @@ type Foo = Bar type Foo ``` -```ucm +``` ucm project/main> update Okay, I'm searching the branch for code that needs to be @@ -1856,7 +1856,7 @@ project/main> update Done. ``` -```ucm +``` ucm project/main> merge topic I merged project/topic into project/main. @@ -1883,7 +1883,7 @@ baz : Text baz = "lca" ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -1898,7 +1898,7 @@ baz = "lca" foo : Nat ``` -```ucm +``` ucm project/alice> add ⍟ I've added these definitions: @@ -1922,7 +1922,7 @@ baz : Text baz = "bob" ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -1936,7 +1936,7 @@ baz = "bob" baz : Text ``` -```ucm +``` ucm project/bob> update Okay, I'm searching the branch for code that needs to be @@ -1955,7 +1955,7 @@ baz : Text baz = "alice" ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -1970,7 +1970,7 @@ baz = "alice" foo : Nat ``` -```ucm +``` ucm project/alice> update Okay, I'm searching the branch for code that needs to be @@ -1986,7 +1986,7 @@ project/alice> update When we try to merge Bob into Alice, we should see both versions of `baz`, with Alice's unconflicted `foo` and `bar` in the underlying namespace. -```ucm +``` ucm project/alice> merge /bob I couldn't automatically merge project/bob into project/alice. @@ -2038,7 +2038,7 @@ Let's make three identical namespaces with different histories: a = 1 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -2051,7 +2051,7 @@ a = 1 a : ##Nat ``` -```ucm +``` ucm project/alice> add ⍟ I've added these definitions: @@ -2063,7 +2063,7 @@ project/alice> add b = 2 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -2076,7 +2076,7 @@ b = 2 b : ##Nat ``` -```ucm +``` ucm project/alice> add ⍟ I've added these definitions: @@ -2088,7 +2088,7 @@ project/alice> add b = 2 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -2096,7 +2096,7 @@ b = 2 file has been previously added to the codebase. ``` -```ucm +``` ucm project/bob> add ⍟ I've added these definitions: @@ -2108,7 +2108,7 @@ project/bob> add a = 1 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -2121,7 +2121,7 @@ a = 1 a : ##Nat ``` -```ucm +``` ucm project/bob> add ⍟ I've added these definitions: @@ -2134,7 +2134,7 @@ a = 1 b = 2 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -2142,7 +2142,7 @@ b = 2 file has been previously added to the codebase. ``` -```ucm +``` ucm project/carol> add ⍟ I've added these definitions: @@ -2193,7 +2193,7 @@ bar = foo + foo ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -2208,7 +2208,7 @@ bar = ignore : a -> () ``` -```ucm +``` ucm scratch/alice> add ⍟ I've added these definitions: @@ -2232,7 +2232,7 @@ bar = foo + foo + foo ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -2246,7 +2246,7 @@ bar = bar : Nat ``` -```ucm +``` ucm scratch/bob> update Okay, I'm searching the branch for code that needs to be @@ -2263,7 +2263,7 @@ foo : Nat foo = 19 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -2277,7 +2277,7 @@ foo = 19 foo : Nat ``` -```ucm +``` ucm scratch/alice> update Okay, I'm searching the branch for code that needs to be @@ -2290,7 +2290,7 @@ scratch/alice> update Done. ``` -```ucm +``` ucm scratch/alice> merge /bob I merged scratch/bob into scratch/alice. diff --git a/unison-src/transcripts/move-all.output.md b/unison-src/transcripts/move-all.output.md index cd68b319c..36116ad2b 100644 --- a/unison-src/transcripts/move-all.output.md +++ b/unison-src/transcripts/move-all.output.md @@ -11,7 +11,7 @@ Foo.termInA = 1 unique type Foo.T = T ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -27,7 +27,7 @@ unique type Foo.T = T Foo.termInA : Nat ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -43,7 +43,7 @@ Foo.termInA = 2 unique type Foo.T = T1 | T2 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -59,7 +59,7 @@ unique type Foo.T = T1 | T2 (also named Foo) ``` -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be @@ -70,7 +70,7 @@ scratch/main> update ``` Should be able to move the term, type, and namespace, including its types, terms, and sub-namespaces. -```ucm +``` ucm scratch/main> move Foo Bar Done. @@ -113,7 +113,7 @@ scratch/main> history Bar bonk = 5 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -126,7 +126,7 @@ bonk = 5 bonk : Nat ``` -```ucm +``` ucm z/main> builtins.merge Done. @@ -153,7 +153,7 @@ z/main> ls bonk.zonk = 5 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -167,7 +167,7 @@ bonk.zonk = 5 (also named zonk) ``` -```ucm +``` ucm a/main> builtins.merge Done. @@ -195,7 +195,7 @@ a/main> view zonk.zonk ``` ## Sad Path - No term, type, or namespace named src -```ucm +``` ucm scratch/main> move doesntexist foo ⚠️ diff --git a/unison-src/transcripts/move-namespace.output.md b/unison-src/transcripts/move-namespace.output.md index 57b010c0d..627edf4a9 100644 --- a/unison-src/transcripts/move-namespace.output.md +++ b/unison-src/transcripts/move-namespace.output.md @@ -8,7 +8,7 @@ I should be able to move the root into a sub-namespace foo = 1 ``` -```ucm +``` ucm .> add ⍟ I've added these definitions: @@ -41,7 +41,7 @@ foo = 1 □ 1. #g97lh1m2v7 (start of history) ``` -```ucm +``` ucm .> ls .root.at.path 1. foo (##Nat) @@ -58,7 +58,7 @@ foo = 1 ``` I should be able to move a sub namespace *over* the root. -```ucm +``` ucm -- Should request confirmation .> move.namespace .root.at.path . @@ -85,7 +85,7 @@ I should be able to move a sub namespace *over* the root. □ 1. #08a6hgi6s4 (start of history) ``` -```ucm +``` ucm -- should be empty .> ls .root.at.path @@ -105,7 +105,7 @@ a.termInA = 1 unique type a.T = T ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -119,7 +119,7 @@ unique type a.T = T a.termInA : Nat ``` -```ucm +``` ucm scratch/happy> add ⍟ I've added these definitions: @@ -133,7 +133,7 @@ a.termInA = 2 unique type a.T = T1 | T2 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -148,7 +148,7 @@ unique type a.T = T1 | T2 a.termInA : Nat ``` -```ucm +``` ucm scratch/happy> update Okay, I'm searching the branch for code that needs to be @@ -159,7 +159,7 @@ scratch/happy> update ``` Should be able to move the namespace, including its types, terms, and sub-namespaces. -```ucm +``` ucm scratch/happy> move.namespace a b Done. @@ -197,7 +197,7 @@ a.termInA = 1 b.termInB = 10 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -211,7 +211,7 @@ b.termInB = 10 b.termInB : Nat ``` -```ucm +``` ucm scratch/history> add ⍟ I've added these definitions: @@ -225,7 +225,7 @@ a.termInA = 2 b.termInB = 11 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -240,7 +240,7 @@ b.termInB = 11 b.termInB : Nat ``` -```ucm +``` ucm scratch/history> update Okay, I'm searching the branch for code that needs to be @@ -253,7 +253,7 @@ Deleting a namespace should not leave behind any history, if we move another to that location we expect the history to simply be the history of the moved namespace. -```ucm +``` ucm scratch/history> delete.namespace b Done. @@ -291,7 +291,7 @@ a.termInA = 1 b.termInB = 10 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -305,7 +305,7 @@ b.termInB = 10 b.termInB : Nat ``` -```ucm +``` ucm scratch/existing> add ⍟ I've added these definitions: @@ -319,7 +319,7 @@ a.termInA = 2 b.termInB = 11 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -334,7 +334,7 @@ b.termInB = 11 b.termInB : Nat ``` -```ucm +``` ucm scratch/existing> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/name-segment-escape.output.md b/unison-src/transcripts/name-segment-escape.output.md index f324018ff..4a5842274 100644 --- a/unison-src/transcripts/name-segment-escape.output.md +++ b/unison-src/transcripts/name-segment-escape.output.md @@ -1,6 +1,6 @@ You can use a keyword or reserved operator as a name segment if you surround it with backticks. -```ucm +``` ucm scratch/main> view `match` ⚠️ @@ -20,7 +20,7 @@ You can also use backticks to expand the set of valid symbols in a symboly name This allows you to spell `.` or `()` as name segments (which historically have appeared in the namespace). -```ucm +``` ucm scratch/main> view `.` ⚠️ diff --git a/unison-src/transcripts/name-selection.output.md b/unison-src/transcripts/name-selection.output.md index 0df0ba3a0..f76c6796f 100644 --- a/unison-src/transcripts/name-selection.output.md +++ b/unison-src/transcripts/name-selection.output.md @@ -12,7 +12,7 @@ a.aaa.but.more.segments = 0 + 1 Will add `a` and `b` to the codebase and give `b` a longer (in terms of segment length alias), and show that it isn't used when viewing `a`: -```ucm +``` ucm .> add ⍟ I've added these definitions: @@ -47,7 +47,7 @@ a3.d = a3.c + 10 a3.long.name.but.shortest.suffixification = 1 ``` -```ucm +``` ucm .> add ⍟ I've added these definitions: @@ -84,7 +84,7 @@ At this point, `a3` is conflicted for symbols `c` and `d`, so those are depriori The original `a2` namespace has an unconflicted definition for `c` and `d`, but since there are multiple 'c's in scope, `a2.c` is chosen because although the suffixified version has fewer segments, its fully-qualified name has the fewest segments. -```ucm +``` ucm .> view a b c d a.a : Nat @@ -125,7 +125,7 @@ deeply.nested.num = 10 a = 10 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -140,7 +140,7 @@ a = 10 deeply.nested.term : Nat ``` -```ucm +``` ucm .biasing> add ⍟ I've added these definitions: @@ -166,7 +166,7 @@ Add another term with `num` suffix to force longer suffixification of `deeply.ne other.num = 20 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -179,7 +179,7 @@ other.num = 20 other.num : Nat ``` -```ucm +``` ucm .biasing> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/names.output.md b/unison-src/transcripts/names.output.md index 13d62fd7b..287782fa2 100644 --- a/unison-src/transcripts/names.output.md +++ b/unison-src/transcripts/names.output.md @@ -12,7 +12,7 @@ somewhere.z = 1 somewhere.y = 2 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -29,7 +29,7 @@ somewhere.y = 2 somewhere.z : ##Nat ``` -```ucm +``` ucm .> add ⍟ I've added these definitions: @@ -43,7 +43,7 @@ somewhere.y = 2 ``` `names` searches relative to the current path. -```ucm +``` ucm -- We can search by suffix and find all definitions named 'x', and each of their aliases respectively. -- But we don't see somewhere.z which is has the same value but is out of our namespace .some> names x @@ -78,7 +78,7 @@ somewhere.y = 2 ``` `names.global` searches from the root, and absolutely qualifies results -```ucm +``` ucm -- We can search by suffix and find all definitions in the codebase named 'x', and each of their aliases respectively. .some> names.global x diff --git a/unison-src/transcripts/namespace-deletion-regression.output.md b/unison-src/transcripts/namespace-deletion-regression.output.md index 21e0866f7..1730897d3 100644 --- a/unison-src/transcripts/namespace-deletion-regression.output.md +++ b/unison-src/transcripts/namespace-deletion-regression.output.md @@ -7,7 +7,7 @@ If branch operations aren't performed in the correct order it's possible to end Previously the following sequence delete the current namespace unexpectedly 😬. -```ucm +``` ucm scratch/main> alias.term ##Nat.+ Nat.+ Done. diff --git a/unison-src/transcripts/namespace-dependencies.output.md b/unison-src/transcripts/namespace-dependencies.output.md index ae41b9518..80ea30e39 100644 --- a/unison-src/transcripts/namespace-dependencies.output.md +++ b/unison-src/transcripts/namespace-dependencies.output.md @@ -6,7 +6,7 @@ external.mynat = 1 mynamespace.dependsOnText = const external.mynat 10 ``` -```ucm +``` ucm .> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/numbered-args.output.md b/unison-src/transcripts/numbered-args.output.md index ba6016b96..0567bcac3 100644 --- a/unison-src/transcripts/numbered-args.output.md +++ b/unison-src/transcripts/numbered-args.output.md @@ -11,7 +11,7 @@ quux = "quux" corge = "corge" ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -29,7 +29,7 @@ corge = "corge" qux : Text ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -45,7 +45,7 @@ scratch/main> add We can get the list of things in the namespace, and UCM will give us a numbered list: -```ucm +``` ucm scratch/main> find 1. bar : Text @@ -60,7 +60,7 @@ scratch/main> find ``` We can ask to `view` the second element of this list: -```ucm +``` ucm scratch/main> find 1. bar : Text @@ -80,7 +80,7 @@ scratch/main> view 2 ``` And we can `view` multiple elements by separating with spaces: -```ucm +``` ucm scratch/main> find 1. bar : Text @@ -106,7 +106,7 @@ scratch/main> view 2 3 5 ``` We can also ask for a range: -```ucm +``` ucm scratch/main> find 1. bar : Text @@ -132,7 +132,7 @@ scratch/main> view 2-4 ``` And we can ask for multiple ranges and use mix of ranges and numbers: -```ucm +``` ucm scratch/main> find 1. bar : Text diff --git a/unison-src/transcripts/old-fold-right.output.md b/unison-src/transcripts/old-fold-right.output.md index f054ba959..a74a317a4 100644 --- a/unison-src/transcripts/old-fold-right.output.md +++ b/unison-src/transcripts/old-fold-right.output.md @@ -11,7 +11,7 @@ pecan = 'let oldRight f la ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/pattern-match-coverage.output.md b/unison-src/transcripts/pattern-match-coverage.output.md index ea249e9f7..575c35cab 100644 --- a/unison-src/transcripts/pattern-match-coverage.output.md +++ b/unison-src/transcripts/pattern-match-coverage.output.md @@ -10,7 +10,7 @@ test = cases A -> () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -36,7 +36,7 @@ test = cases (B, None) -> () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -65,7 +65,7 @@ test = cases _ -> () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -86,7 +86,7 @@ test = cases (A, Some A) -> () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -108,7 +108,7 @@ test = cases Some None -> () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -132,7 +132,7 @@ test0 = cases _ -> () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -151,7 +151,7 @@ test = cases Some _ -> () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -170,7 +170,7 @@ test = cases () | false -> () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -191,7 +191,7 @@ test = cases | isEven x -> x ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -217,7 +217,7 @@ test = cases | otherwise -> 0 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -244,7 +244,7 @@ test = cases Some None -> () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -268,7 +268,7 @@ test = cases Some (Some A) -> () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -297,7 +297,7 @@ test = cases 0 -> () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -318,7 +318,7 @@ test = cases true -> () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -342,7 +342,7 @@ test = cases _ -> () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -364,7 +364,7 @@ test = cases false -> () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -389,7 +389,7 @@ test = cases _ -> () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -408,7 +408,7 @@ test = cases _ -> () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -428,7 +428,7 @@ test = cases x +: xs -> () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -449,7 +449,7 @@ test = cases [] -> () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -468,7 +468,7 @@ test = cases x +: xs -> () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -487,7 +487,7 @@ test = cases xs :+ x -> () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -507,7 +507,7 @@ test = cases [] -> () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -528,7 +528,7 @@ test = cases x0 +: [] -> () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -554,7 +554,7 @@ test = cases [] -> () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -586,7 +586,7 @@ test = cases true +: xs -> () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -611,7 +611,7 @@ test = cases _ -> () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -636,7 +636,7 @@ test = cases _ -> () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -655,7 +655,7 @@ unit2t = cases () -> A ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -669,7 +669,7 @@ unit2t = cases unit2t : 'T ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -692,7 +692,7 @@ witht = match unit2t () with x -> () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -712,7 +712,7 @@ evil : Unit -> V evil = bug "" ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -726,7 +726,7 @@ evil = bug "" evil : 'V ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -741,7 +741,7 @@ withV = match evil () with x -> () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -754,7 +754,7 @@ withV = match evil () with unique type SomeType = A ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -767,7 +767,7 @@ unique type SomeType = A type SomeType ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -782,7 +782,7 @@ get x = match x with R y -> y ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -800,7 +800,7 @@ get x = match x with unique type R = { someType : SomeType } ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -831,7 +831,7 @@ result f = handle !f with cases { abort -> _ } -> bug "aborted" ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -858,7 +858,7 @@ result f = handle !f with cases { abort -> _ } -> bug "aborted" ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -889,7 +889,7 @@ result f = handle !f with impl ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -919,7 +919,7 @@ handleMulti c = handle !c with impl [] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -947,7 +947,7 @@ result f = handle !f with cases { abort -> _ } -> bug "aborted" ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -974,7 +974,7 @@ result f = handle !f with cases { abort -> _ } -> bug "aborted" ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -1000,7 +1000,7 @@ result f = handle !f with cases { give A -> resume } -> result resume ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -1030,7 +1030,7 @@ handleMulti c = handle !c with impl [] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -1059,7 +1059,7 @@ result f = handle !f with cases { give A -> resume } -> result resume ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -1083,7 +1083,7 @@ result f = handle !f with cases { abortWithMessage msg -> _ } -> abortWithMessage ("aborting: " ++ msg) ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -1111,7 +1111,7 @@ result f = handle !f with impl ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -1139,7 +1139,7 @@ result f = handle !f with cases { abortWithMessage msg -> _ } -> abortWithMessage ("aborting: " ++ msg) ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -1179,7 +1179,7 @@ result f = handle !f with impl ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -1208,7 +1208,7 @@ result f = handle !f with impl ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -1236,7 +1236,7 @@ result f = handle !f with impl ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -1265,7 +1265,7 @@ result f = handle !f with impl ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -1295,7 +1295,7 @@ result f = handle !f with impl ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -1323,7 +1323,7 @@ result f = handle !f with impl ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/pattern-pretty-print-2345.output.md b/unison-src/transcripts/pattern-pretty-print-2345.output.md index 15ebf8740..711297412 100644 --- a/unison-src/transcripts/pattern-pretty-print-2345.output.md +++ b/unison-src/transcripts/pattern-pretty-print-2345.output.md @@ -59,7 +59,7 @@ doc = cases _ -> () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -86,7 +86,7 @@ doc = cases tremulous : (Nat, Nat) -> () ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/patternMatchTls.output.md b/unison-src/transcripts/patternMatchTls.output.md index 7d207ef37..1e6e9ced2 100644 --- a/unison-src/transcripts/patternMatchTls.output.md +++ b/unison-src/transcripts/patternMatchTls.output.md @@ -20,7 +20,7 @@ assertRight = cases Left _ -> bug "expected a right but got a left" ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -34,7 +34,7 @@ assertRight = cases frank : '{IO} () ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/patterns.output.md b/unison-src/transcripts/patterns.output.md index 054c9224e..f68423848 100644 --- a/unison-src/transcripts/patterns.output.md +++ b/unison-src/transcripts/patterns.output.md @@ -7,7 +7,7 @@ p1 = join [literal "blue", literal "frog"] > Pattern.run (many.corrected p1) "bluefrogbluegoat" ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/propagate.output.md b/unison-src/transcripts/propagate.output.md index 036681f1b..14da5ae23 100644 --- a/unison-src/transcripts/propagate.output.md +++ b/unison-src/transcripts/propagate.output.md @@ -9,7 +9,7 @@ fooToInt : Foo -> Int fooToInt _ = +42 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -25,7 +25,7 @@ fooToInt _ = +42 ``` And then we add it. -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -58,7 +58,7 @@ Then if we change the type `Foo`... unique type Foo = Foo | Bar ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -74,7 +74,7 @@ unique type Foo = Foo | Bar ``` and update the codebase to use the new type `Foo`... -```ucm +``` ucm scratch/main> update.old ⍟ I've updated these names to your new definition: @@ -84,7 +84,7 @@ scratch/main> update.old ``` ... it should automatically propagate the type to `fooToInt`. -```ucm +``` ucm scratch/main> view fooToInt fooToInt : Foo -> Int @@ -104,7 +104,7 @@ preserve.otherTerm : Optional baz -> Optional baz preserve.otherTerm y = someTerm y ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -120,7 +120,7 @@ preserve.otherTerm y = someTerm y ``` Add that to the codebase: -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -136,7 +136,7 @@ preserve.someTerm : Optional x -> Optional x preserve.someTerm _ = None ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -152,7 +152,7 @@ preserve.someTerm _ = None ``` Update... -```ucm +``` ucm scratch/main> update.old ⍟ I've updated these names to your new definition: @@ -163,7 +163,7 @@ scratch/main> update.old Now the type of `someTerm` should be `Optional x -> Optional x` and the type of `otherTerm` should remain the same. -```ucm +``` ucm scratch/main> view preserve.someTerm preserve.someTerm : Optional x -> Optional x @@ -179,7 +179,7 @@ scratch/main> view preserve.otherTerm Cleaning up a bit... -```ucm +``` ucm ☝️ The namespace .subpath.lib is empty. .subpath.lib> builtins.merge @@ -197,7 +197,7 @@ one.otherTerm : Optional baz -> Optional baz one.otherTerm y = someTerm y ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -213,7 +213,7 @@ one.otherTerm y = someTerm y ``` We'll make two copies of this namespace. -```ucm +``` ucm .subpath> add ⍟ I've added these definitions: @@ -233,7 +233,7 @@ someTerm : Optional x -> Optional x someTerm _ = None ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -248,7 +248,7 @@ someTerm _ = None ``` ... in one of the namespaces... -```ucm +``` ucm .subpath.one> update.old ⍟ I've updated these names to your new definition: @@ -258,7 +258,7 @@ someTerm _ = None ``` The other namespace should be left alone. -```ucm +``` ucm .subpath> view two.someTerm two.someTerm : Optional foo -> Optional foo diff --git a/unison-src/transcripts/pull-errors.output.md b/unison-src/transcripts/pull-errors.output.md index 063c439dd..38afde71c 100644 --- a/unison-src/transcripts/pull-errors.output.md +++ b/unison-src/transcripts/pull-errors.output.md @@ -1,4 +1,4 @@ -```ucm +``` ucm test/main> pull @aryairani/test-almost-empty/main lib.base_latest The use of `pull` to install libraries is now deprecated. diff --git a/unison-src/transcripts/records.output.md b/unison-src/transcripts/records.output.md index 8d2be7417..3e3d66245 100644 --- a/unison-src/transcripts/records.output.md +++ b/unison-src/transcripts/records.output.md @@ -6,7 +6,7 @@ Ensure that Records keep their syntax after being added to the codebase unique type Record1 = { a : Text } ``` -```ucm +``` ucm scratch/main> view Record1 type Record1 = { a : Text } @@ -18,7 +18,7 @@ scratch/main> view Record1 unique type Record2 = { a : Text, b : Int } ``` -```ucm +``` ucm scratch/main> view Record2 type Record2 = { a : Text, b : Int } @@ -30,7 +30,7 @@ scratch/main> view Record2 unique type Record3 = { a : Text, b : Int, c : Nat } ``` -```ucm +``` ucm scratch/main> view Record3 type Record3 = { a : Text, b : Int, c : Nat } @@ -50,7 +50,7 @@ unique type Record4 = } ``` -```ucm +``` ucm scratch/main> view Record4 type Record4 @@ -91,7 +91,7 @@ unique type Record5 = { } ``` -```ucm +``` ucm scratch/main> view Record5 type Record5 @@ -130,7 +130,7 @@ unique type RecordWithUserType = { a : Text, b : Record4, c : UserType } If you `view` or `edit` it, it *should* be treated as a record type, but it does not (which is a bug) -```ucm +``` ucm scratch/main> view RecordWithUserType type RecordWithUserType @@ -148,7 +148,7 @@ unique type Record5 = } ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/reflog.output.md b/unison-src/transcripts/reflog.output.md index a608b04a9..c78f00a83 100644 --- a/unison-src/transcripts/reflog.output.md +++ b/unison-src/transcripts/reflog.output.md @@ -5,7 +5,7 @@ for the `reflog` command to display: x = 1 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -18,7 +18,7 @@ x = 1 x : Nat ``` -```ucm +``` ucm .> add ⍟ I've added these definitions: @@ -30,7 +30,7 @@ x = 1 y = 2 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -43,7 +43,7 @@ y = 2 y : Nat ``` -```ucm +``` ucm .> add ⍟ I've added these definitions: @@ -56,7 +56,7 @@ y = 2 y = 2 ``` -```ucm +``` ucm .> reflog Here is a log of the root namespace hashes, starting with the @@ -82,13 +82,13 @@ y = 2 ``` If we `reset-root` to its previous value, `y` disappears. -```ucm +``` ucm .> reset-root 2 Done. ``` -```ucm +``` ucm .> view y ⚠️ diff --git a/unison-src/transcripts/release-draft-command.output.md b/unison-src/transcripts/release-draft-command.output.md index 58077a37e..3354e764f 100644 --- a/unison-src/transcripts/release-draft-command.output.md +++ b/unison-src/transcripts/release-draft-command.output.md @@ -6,7 +6,7 @@ Some setup: someterm = 18 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -19,7 +19,7 @@ someterm = 18 someterm : Nat ``` -```ucm +``` ucm foo/main> add ⍟ I've added these definitions: @@ -31,7 +31,7 @@ Now, the `release.draft` demo: `release.draft` accepts a single semver argument. -```ucm +``` ucm foo/main> release.draft 1.2.3 😎 Great! I've created a draft release for you at @@ -51,7 +51,7 @@ foo/main> release.draft 1.2.3 ``` It's an error to try to create a `releases/drafts/x.y.z` branch that already exists. -```ucm +``` ucm foo/main> release.draft 1.2.3 foo/releases/drafts/1.2.3 already exists. You can switch to it diff --git a/unison-src/transcripts/reset.output.md b/unison-src/transcripts/reset.output.md index 1858250ab..8fa6362a9 100644 --- a/unison-src/transcripts/reset.output.md +++ b/unison-src/transcripts/reset.output.md @@ -4,7 +4,7 @@ a = 5 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -17,7 +17,7 @@ a = 5 a : Nat ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -55,7 +55,7 @@ scratch/main> history foo.a = 5 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -68,7 +68,7 @@ foo.a = 5 foo.a : Nat ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -103,7 +103,7 @@ scratch/main> ls foo.foo ``` # reset branch -```ucm +``` ucm foo/main> history ☝️ The namespace is empty. @@ -113,7 +113,7 @@ foo/main> history a = 5 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -126,7 +126,7 @@ a = 5 a : ##Nat ``` -```ucm +``` ucm foo/main> add ⍟ I've added these definitions: @@ -154,7 +154,7 @@ foo/main> history a = 3 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -168,7 +168,7 @@ a = 3 a : ##Nat ``` -```ucm +``` ucm foo/main> update Okay, I'm searching the branch for code that needs to be @@ -198,7 +198,7 @@ foo/main> history main.a = 3 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -211,7 +211,7 @@ main.a = 3 main.a : ##Nat ``` -```ucm +``` ucm foo/main> add ⍟ I've added these definitions: @@ -250,7 +250,7 @@ foo/main> reset 2 main main.a = 3 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -258,7 +258,7 @@ main.a = 3 file has been previously added to the codebase. ``` -```ucm +``` ucm foo/main> switch /topic foo/topic> add diff --git a/unison-src/transcripts/resolution-failures.output.md b/unison-src/transcripts/resolution-failures.output.md index 262f6f744..d30deb424 100644 --- a/unison-src/transcripts/resolution-failures.output.md +++ b/unison-src/transcripts/resolution-failures.output.md @@ -14,7 +14,7 @@ one.ambiguousTerm = "term one" two.ambiguousTerm = "term two" ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -30,7 +30,7 @@ two.ambiguousTerm = "term two" two.ambiguousTerm : ##Text ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -65,7 +65,7 @@ separateAmbiguousTypeUsage : AmbiguousType -> () separateAmbiguousTypeUsage _ = () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -100,7 +100,7 @@ but expect it to eventually be handled by the above machinery. useAmbiguousTerm = ambiguousTerm ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/rsa.output.md b/unison-src/transcripts/rsa.output.md index a5994b24b..98e735c2e 100644 --- a/unison-src/transcripts/rsa.output.md +++ b/unison-src/transcripts/rsa.output.md @@ -30,7 +30,7 @@ sigKo = match signature with > sigKo ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/scope-ref.output.md b/unison-src/transcripts/scope-ref.output.md index 131918662..c356bc531 100644 --- a/unison-src/transcripts/scope-ref.output.md +++ b/unison-src/transcripts/scope-ref.output.md @@ -13,7 +13,7 @@ test = Scope.run 'let > test ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/suffixes.output.md b/unison-src/transcripts/suffixes.output.md index 5752f2918..43aa678ef 100644 --- a/unison-src/transcripts/suffixes.output.md +++ b/unison-src/transcripts/suffixes.output.md @@ -15,7 +15,7 @@ optional.isNone = cases This also affects commands like find. Notice lack of qualified names in output: -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -35,7 +35,7 @@ scratch/main> find take ``` The `view` and `display` commands also benefit from this: -```ucm +``` ucm scratch/main> view List.drop builtin builtin.List.drop : builtin.Nat -> [a] -> [a] @@ -49,7 +49,7 @@ In the signature, we don't see `base.Nat`, just `Nat`. The full declaration name Type-based search also benefits from this, we can just say `Nat` rather than `.base.Nat`: -```ucm +``` ucm scratch/main> find : Nat -> [a] -> [a] 1. builtin.List.drop : Nat -> [a] -> [a] @@ -68,7 +68,7 @@ lib.distributed.baz.qux = "direct dependency 2" lib.distributed.lib.baz.qux = "indirect dependency" ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -84,7 +84,7 @@ lib.distributed.lib.baz.qux = "indirect dependency" lib.distributed.lib.baz.qux : Text ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -99,7 +99,7 @@ scratch/main> add > abra.cadabra ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -121,7 +121,7 @@ scratch/main> add > baz.qux ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -137,7 +137,7 @@ scratch/main> add "direct dependency 2" ``` -```ucm +``` ucm scratch/main> view abra.cadabra cool.abra.cadabra : Text @@ -154,7 +154,7 @@ scratch/main> view baz.qux ``` Note that we can always still view indirect dependencies by using more name segments: -```ucm +``` ucm scratch/main> view distributed.abra.cadabra lib.distributed.abra.cadabra : Text @@ -180,7 +180,7 @@ foo.a = 23 bar = 100 ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -207,7 +207,7 @@ fn = cases _ -> todo "hmm" ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/sum-type-update-conflicts.output.md b/unison-src/transcripts/sum-type-update-conflicts.output.md index f28ec5dd4..ba70632b8 100644 --- a/unison-src/transcripts/sum-type-update-conflicts.output.md +++ b/unison-src/transcripts/sum-type-update-conflicts.output.md @@ -8,7 +8,7 @@ First we add a sum-type to the codebase. structural type X = x ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -22,7 +22,7 @@ structural type X = x (also named lib.builtins.Unit) ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -43,7 +43,7 @@ X.x = "some text that's not in the codebase" dependsOnX = Text.size X.x ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -66,7 +66,7 @@ dependsOnX = Text.size X.x This update should succeed since the conflicted constructor is removed in the same update that the new term is being added. -```ucm +``` ucm scratch/main> update.old ⍟ I've added these definitions: diff --git a/unison-src/transcripts/switch-command.output.md b/unison-src/transcripts/switch-command.output.md index f00a15723..96778f99d 100644 --- a/unison-src/transcripts/switch-command.output.md +++ b/unison-src/transcripts/switch-command.output.md @@ -6,7 +6,7 @@ Setup stuff. someterm = 18 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -19,7 +19,7 @@ someterm = 18 someterm : Nat ``` -```ucm +``` ucm foo/main> add ⍟ I've added these definitions: @@ -45,7 +45,7 @@ Now, the demo. When unambiguous, `switch` switches to either a project or a bran the current project can be preceded by a forward slash (which makes it unambiguous). A project can be followed by a forward slash (which makes it unambiguous). -```ucm +``` ucm scratch/main> switch foo scratch/main> switch foo/topic @@ -59,7 +59,7 @@ foo/main> switch bar/ ``` It's an error to try to switch to something ambiguous. -```ucm +``` ucm foo/main> switch bar I'm not sure if you wanted to switch to the branch foo/bar or @@ -73,20 +73,20 @@ foo/main> switch bar ``` It's an error to try to switch to something that doesn't exist, of course. -```ucm +``` ucm scratch/main> switch foo/no-such-branch foo/no-such-branch does not exist. ``` -```ucm +``` ucm scratch/main> switch no-such-project Neither project no-such-project nor branch /no-such-project exists. ``` -```ucm +``` ucm foo/main> switch no-such-project-or-branch Neither project no-such-project-or-branch nor branch diff --git a/unison-src/transcripts/tab-completion.output.md b/unison-src/transcripts/tab-completion.output.md index 86a7b552e..98c26e77f 100644 --- a/unison-src/transcripts/tab-completion.output.md +++ b/unison-src/transcripts/tab-completion.output.md @@ -4,7 +4,7 @@ Test that tab completion works as expected. ## Tab Complete Command Names -```ucm +``` ucm scratch/main> debug.tab-complete vi view @@ -34,7 +34,7 @@ othernamespace.someName = 4 unique type subnamespace.AType = A | B ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -51,7 +51,7 @@ unique type subnamespace.AType = A | B subnamespace2.thing : ##Nat ``` -```ucm +``` ucm -- Should tab complete namespaces since they may contain terms/types scratch/main> debug.tab-complete view sub @@ -93,7 +93,7 @@ scratch/main> debug.tab-complete view subnamespace.someOther absolute.term = "absolute" ``` -```ucm +``` ucm .> add ⍟ I've added these definitions: @@ -108,7 +108,7 @@ absolute.term = "absolute" ``` ## Tab complete namespaces -```ucm +``` ucm -- Should tab complete namespaces scratch/main> debug.tab-complete find-in sub @@ -149,7 +149,7 @@ add : a -> a add b = b ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -163,7 +163,7 @@ add b = b add : a -> a ``` -```ucm +``` ucm scratch/main> update.old ⍟ I've added these definitions: @@ -183,7 +183,7 @@ scratch/main> debug.tab-complete delete.term add ``` ## Tab complete projects and branches -```ucm +``` ucm myproject/main> branch mybranch Done. I've created the mybranch branch based off of main. @@ -206,7 +206,7 @@ Commands which complete namespaces OR branches should list both mybranchsubnamespace.term = 1 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -219,7 +219,7 @@ mybranchsubnamespace.term = 1 mybranchsubnamespace.term : ##Nat ``` -```ucm +``` ucm myproject/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/test-command.output.md b/unison-src/transcripts/test-command.output.md index 4182b223c..f603bc3f1 100644 --- a/unison-src/transcripts/test-command.output.md +++ b/unison-src/transcripts/test-command.output.md @@ -10,7 +10,7 @@ foo.test2 : [Result] foo.test2 = [Ok "test2"] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -24,7 +24,7 @@ foo.test2 = [Ok "test2"] test1 : [Result] ``` -```ucm +``` ucm scratch/main> test ✅ @@ -49,7 +49,7 @@ scratch/main> test ``` Tests should be cached if unchanged. -```ucm +``` ucm scratch/main> test Cached test results (`help testcache` to learn more) @@ -69,7 +69,7 @@ lib.dep.testInLib : [Result] lib.dep.testInLib = [Ok "testInLib"] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -82,7 +82,7 @@ lib.dep.testInLib = [Ok "testInLib"] lib.dep.testInLib : [Result] ``` -```ucm +``` ucm scratch/main> test Cached test results (`help testcache` to learn more) @@ -121,7 +121,7 @@ scratch/main> test.all ``` `test` WILL run tests within `lib` if specified explicitly. -```ucm +``` ucm scratch/main> test lib.dep Cached test results (`help testcache` to learn more) @@ -135,7 +135,7 @@ scratch/main> test lib.dep ``` `test` can be given a relative path, in which case it will only run tests found somewhere in that namespace. -```ucm +``` ucm scratch/main> test foo Cached test results (`help testcache` to learn more) diff --git a/unison-src/transcripts/text-literals.output.md b/unison-src/transcripts/text-literals.output.md index f9d4311f2..b023a3d06 100644 --- a/unison-src/transcripts/text-literals.output.md +++ b/unison-src/transcripts/text-literals.output.md @@ -31,7 +31,7 @@ lit2 = """" > Some lit2 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -85,7 +85,7 @@ lit2 = """" "This is a raw text literal, indented.\nIt can start with 3 or more \",\nand is terminated by the same number of quotes.\nNothing is escaped. \\n\n\nThis doesn't terminate the literal - \"\"\"" ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/todo-bug-builtins.output.md b/unison-src/transcripts/todo-bug-builtins.output.md index 104d6bf86..932353888 100644 --- a/unison-src/transcripts/todo-bug-builtins.output.md +++ b/unison-src/transcripts/todo-bug-builtins.output.md @@ -6,7 +6,7 @@ > todo "implement me later" ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -33,7 +33,7 @@ > bug "there's a bug in my code" ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -64,7 +64,7 @@ complicatedMathStuff x = todo "Come back and to something with x here" ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -87,7 +87,7 @@ test = match true with false -> bug "Wow, that's unexpected" ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/todo.output.md b/unison-src/transcripts/todo.output.md index 434e7a43d..c29c70e12 100644 --- a/unison-src/transcripts/todo.output.md +++ b/unison-src/transcripts/todo.output.md @@ -2,7 +2,7 @@ When there's nothing to do, `todo` says this: -```ucm +``` ucm project/main> todo You have no pending todo items. Good work! ✅ @@ -24,7 +24,7 @@ bar : Nat bar = foo + foo ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -38,7 +38,7 @@ bar = foo + foo foo : Nat ``` -```ucm +``` ucm project/main> add ⍟ I've added these definitions: @@ -63,7 +63,7 @@ foo.bar = 15 baz = foo.bar + foo.bar ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -77,7 +77,7 @@ baz = foo.bar + foo.bar foo.bar : Nat ``` -```ucm +``` ucm project/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/top-level-exceptions.output.md b/unison-src/transcripts/top-level-exceptions.output.md index 4a889dedc..ded6bdda0 100644 --- a/unison-src/transcripts/top-level-exceptions.output.md +++ b/unison-src/transcripts/top-level-exceptions.output.md @@ -2,7 +2,7 @@ A simple transcript to test the use of exceptions that bubble to the top level. FYI, here are the `Exception` and `Failure` types: -```ucm +``` ucm scratch/main> view Exception Failure structural ability builtin.Exception where @@ -24,7 +24,7 @@ mytest : '{IO, Exception} [Test.Result] mytest _ = [Ok "Great"] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -38,7 +38,7 @@ mytest _ = [Ok "Great"] mytest : '{IO, Exception} [Result] ``` -```ucm +``` ucm scratch/main> run main () @@ -73,7 +73,7 @@ error msg a = unique type RuntimeError = ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -88,7 +88,7 @@ unique type RuntimeError = main2 : '{Exception} r ``` -```ucm +``` ucm scratch/main> run main2 💔💥 diff --git a/unison-src/transcripts/transcript-parser-commands.output.md b/unison-src/transcripts/transcript-parser-commands.output.md index 842ea130c..f6971c59e 100644 --- a/unison-src/transcripts/transcript-parser-commands.output.md +++ b/unison-src/transcripts/transcript-parser-commands.output.md @@ -6,7 +6,7 @@ The transcript parser is meant to parse `ucm` and `unison` blocks. x = 1 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -19,7 +19,7 @@ x = 1 x : Nat ``` -```ucm +``` ucm .> add ⍟ I've added these definitions: @@ -35,7 +35,7 @@ z ``` -```ucm +``` ucm .> delete foo ⚠️ @@ -44,7 +44,7 @@ z foo ``` -```ucm +``` ucm .> delete lineToken.call ⚠️ diff --git a/unison-src/transcripts/type-deps.output.md b/unison-src/transcripts/type-deps.output.md index 24ab0e288..fb04cc34c 100644 --- a/unison-src/transcripts/type-deps.output.md +++ b/unison-src/transcripts/type-deps.output.md @@ -15,7 +15,7 @@ structural type Z = Z Y structural type Y = Y Nat ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -36,7 +36,7 @@ structural type Y = Y Nat ``` Adding should fail for BOTH definitions, `Y` needs an update and `Z` is blocked by `Y`. -```ucm +``` ucm scratch/main> add x These definitions failed: diff --git a/unison-src/transcripts/type-modifier-are-optional.output.md b/unison-src/transcripts/type-modifier-are-optional.output.md index 34c562d15..6cd6812da 100644 --- a/unison-src/transcripts/type-modifier-are-optional.output.md +++ b/unison-src/transcripts/type-modifier-are-optional.output.md @@ -12,7 +12,7 @@ unique ability MyAbilityU where const : a structural ability MyAbilityS where const : a ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/unique-type-churn.output.md b/unison-src/transcripts/unique-type-churn.output.md index f633292e8..ea0058643 100644 --- a/unison-src/transcripts/unique-type-churn.output.md +++ b/unison-src/transcripts/unique-type-churn.output.md @@ -8,7 +8,7 @@ unique type B = B C unique type C = C B ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -23,7 +23,7 @@ unique type C = C B type C ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -40,7 +40,7 @@ unique type B = B C unique type C = C B ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -50,7 +50,7 @@ unique type C = C B ``` If the name stays the same, the churn is even prevented if the type is updated and then reverted to the original form. -```ucm +``` ucm scratch/main> names A Type @@ -68,7 +68,7 @@ scratch/main> names A unique type A = A () ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -82,7 +82,7 @@ unique type A = A () type A ``` -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be @@ -107,7 +107,7 @@ scratch/main> names A unique type A = A ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -123,7 +123,7 @@ unique type A = A ``` Note that `A` is back to its original hash. -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/unitnamespace.output.md b/unison-src/transcripts/unitnamespace.output.md index 9bc427434..0a4833afe 100644 --- a/unison-src/transcripts/unitnamespace.output.md +++ b/unison-src/transcripts/unitnamespace.output.md @@ -2,7 +2,7 @@ `()`.foo = "bar" ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -15,7 +15,7 @@ `()`.foo : ##Text ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: diff --git a/unison-src/transcripts/universal-cmp.output.md b/unison-src/transcripts/universal-cmp.output.md index af4bced3e..5b8913fff 100644 --- a/unison-src/transcripts/universal-cmp.output.md +++ b/unison-src/transcripts/universal-cmp.output.md @@ -10,7 +10,7 @@ threadEyeDeez _ = (t1 == t2, t1 < t2) ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -24,7 +24,7 @@ threadEyeDeez _ = threadEyeDeez : ∀ _. _ ->{IO} (Boolean, Boolean) ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -44,7 +44,7 @@ scratch/main> run threadEyeDeez > termLink threadEyeDeez == termLink threadEyeDeez ``` -```ucm +``` ucm Loading changes detected in scratch.u. diff --git a/unison-src/transcripts/unsafe-coerce.output.md b/unison-src/transcripts/unsafe-coerce.output.md index 73ed1c625..20380cb69 100644 --- a/unison-src/transcripts/unsafe-coerce.output.md +++ b/unison-src/transcripts/unsafe-coerce.output.md @@ -11,7 +11,7 @@ main _ = if n == 5 then [Ok ""] else [Fail ""] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -26,7 +26,7 @@ main _ = main : '{IO, Exception} [Result] ``` -```ucm +``` ucm scratch/main> find unsafe.coerceAbilities 1. builtin.unsafe.coerceAbilities : (a ->{e1} b) -> a -> b diff --git a/unison-src/transcripts/update-ignores-lib-namespace.output.md b/unison-src/transcripts/update-ignores-lib-namespace.output.md index ffc4147d0..dc03596d0 100644 --- a/unison-src/transcripts/update-ignores-lib-namespace.output.md +++ b/unison-src/transcripts/update-ignores-lib-namespace.output.md @@ -7,7 +7,7 @@ foo = 100 lib.foo = 100 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -21,7 +21,7 @@ lib.foo = 100 lib.foo : Nat ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -34,7 +34,7 @@ scratch/main> add foo = 200 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -49,7 +49,7 @@ foo = 200 (The old definition is also named lib.foo.) ``` -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/update-on-conflict.output.md b/unison-src/transcripts/update-on-conflict.output.md index 8d05b394f..373d3ac22 100644 --- a/unison-src/transcripts/update-on-conflict.output.md +++ b/unison-src/transcripts/update-on-conflict.output.md @@ -7,7 +7,7 @@ x = 1 temp = 2 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -21,7 +21,7 @@ temp = 2 x : Nat ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -42,7 +42,7 @@ scratch/main> delete.term temp x = 3 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -56,7 +56,7 @@ x = 3 x : Nat ``` -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/update-suffixifies-properly.output.md b/unison-src/transcripts/update-suffixifies-properly.output.md index a2a938fea..b76176388 100644 --- a/unison-src/transcripts/update-suffixifies-properly.output.md +++ b/unison-src/transcripts/update-suffixifies-properly.output.md @@ -7,7 +7,7 @@ d.y.y.y.y = foo + 10 bar = a.x.x.x.x + c.y.y.y.y ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -25,7 +25,7 @@ bar = a.x.x.x.x + c.y.y.y.y foo : Nat ``` -```ucm +``` ucm myproject/main> add ⍟ I've added these definitions: @@ -42,7 +42,7 @@ myproject/main> add foo = +30 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -56,7 +56,7 @@ foo = +30 foo : Int ``` -```ucm +``` ucm myproject/main> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/update-term-aliases-in-different-ways.output.md b/unison-src/transcripts/update-term-aliases-in-different-ways.output.md index 3d16a9254..5b0e7bf65 100644 --- a/unison-src/transcripts/update-term-aliases-in-different-ways.output.md +++ b/unison-src/transcripts/update-term-aliases-in-different-ways.output.md @@ -1,4 +1,4 @@ -```ucm +``` ucm scratch/main> builtins.merge Done. @@ -12,7 +12,7 @@ bar : Nat bar = 5 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -26,7 +26,7 @@ bar = 5 foo : Nat ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -43,7 +43,7 @@ bar : Nat bar = 7 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -60,7 +60,7 @@ bar = 7 (The old definition is also named bar.) ``` -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/update-term-to-different-type.output.md b/unison-src/transcripts/update-term-to-different-type.output.md index a525811da..c1f65aaca 100644 --- a/unison-src/transcripts/update-term-to-different-type.output.md +++ b/unison-src/transcripts/update-term-to-different-type.output.md @@ -1,4 +1,4 @@ -```ucm +``` ucm scratch/main> builtins.merge Done. @@ -9,7 +9,7 @@ foo : Nat foo = 5 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -22,7 +22,7 @@ foo = 5 foo : Nat ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -35,7 +35,7 @@ foo : Int foo = +5 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -49,7 +49,7 @@ foo = +5 foo : Int ``` -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/update-term-with-alias.output.md b/unison-src/transcripts/update-term-with-alias.output.md index 03124e794..b0fbeab2a 100644 --- a/unison-src/transcripts/update-term-with-alias.output.md +++ b/unison-src/transcripts/update-term-with-alias.output.md @@ -1,4 +1,4 @@ -```ucm +``` ucm scratch/main> builtins.merge Done. @@ -12,7 +12,7 @@ bar : Nat bar = 5 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -26,7 +26,7 @@ bar = 5 foo : Nat ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -40,7 +40,7 @@ foo : Nat foo = 6 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -55,7 +55,7 @@ foo = 6 (The old definition is also named bar.) ``` -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/update-term-with-dependent-to-different-type.output.md b/unison-src/transcripts/update-term-with-dependent-to-different-type.output.md index aef8fcb1e..02eeabcfc 100644 --- a/unison-src/transcripts/update-term-with-dependent-to-different-type.output.md +++ b/unison-src/transcripts/update-term-with-dependent-to-different-type.output.md @@ -1,4 +1,4 @@ -```ucm +``` ucm scratch/main> builtins.merge Done. @@ -12,7 +12,7 @@ bar : Nat bar = foo + 10 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -26,7 +26,7 @@ bar = foo + 10 foo : Nat ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -40,7 +40,7 @@ foo : Int foo = +5 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -54,7 +54,7 @@ foo = +5 foo : Int ``` -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/update-term-with-dependent.output.md b/unison-src/transcripts/update-term-with-dependent.output.md index 79aee87f3..42ae8158f 100644 --- a/unison-src/transcripts/update-term-with-dependent.output.md +++ b/unison-src/transcripts/update-term-with-dependent.output.md @@ -1,4 +1,4 @@ -```ucm +``` ucm scratch/main> builtins.merge Done. @@ -12,7 +12,7 @@ bar : Nat bar = foo + 10 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -26,7 +26,7 @@ bar = foo + 10 foo : Nat ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -40,7 +40,7 @@ foo : Nat foo = 6 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -54,7 +54,7 @@ foo = 6 foo : Nat ``` -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/update-term.output.md b/unison-src/transcripts/update-term.output.md index 982c3b23a..54abb8e06 100644 --- a/unison-src/transcripts/update-term.output.md +++ b/unison-src/transcripts/update-term.output.md @@ -1,4 +1,4 @@ -```ucm +``` ucm scratch/main> builtins.merge Done. @@ -9,7 +9,7 @@ foo : Nat foo = 5 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -22,7 +22,7 @@ foo = 5 foo : Nat ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -35,7 +35,7 @@ foo : Nat foo = 6 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -49,7 +49,7 @@ foo = 6 foo : Nat ``` -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/update-test-to-non-test.output.md b/unison-src/transcripts/update-test-to-non-test.output.md index fc9363d5a..5275b97eb 100644 --- a/unison-src/transcripts/update-test-to-non-test.output.md +++ b/unison-src/transcripts/update-test-to-non-test.output.md @@ -1,4 +1,4 @@ -```ucm +``` ucm scratch/main> builtins.merge Done. @@ -8,7 +8,7 @@ scratch/main> builtins.merge test> foo = [] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -29,7 +29,7 @@ test> foo = [] ``` After adding the test `foo`, we expect `view` to render it like a test. (Bug: It doesn't.) -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -46,7 +46,7 @@ scratch/main> view foo foo = 1 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -62,7 +62,7 @@ foo = 1 ``` After updating `foo` to not be a test, we expect `view` to not render it like a test. -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/update-test-watch-roundtrip.output.md b/unison-src/transcripts/update-test-watch-roundtrip.output.md index 5ba534cd3..31aa18ea2 100644 --- a/unison-src/transcripts/update-test-watch-roundtrip.output.md +++ b/unison-src/transcripts/update-test-watch-roundtrip.output.md @@ -8,7 +8,7 @@ test> mynamespace.foo.test = if (foo n) == 2 then [ Ok "passed" ] else [ Fail "wat" ] ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -23,7 +23,7 @@ if we change the type of the dependency, the test should show in the scratch fil foo n = "hello, world!" ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -37,7 +37,7 @@ foo n = "hello, world!" foo : n -> Text ``` -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/update-type-add-constructor.output.md b/unison-src/transcripts/update-type-add-constructor.output.md index 5f58f745c..c87b1b7cd 100644 --- a/unison-src/transcripts/update-type-add-constructor.output.md +++ b/unison-src/transcripts/update-type-add-constructor.output.md @@ -3,7 +3,7 @@ unique type Foo = Bar Nat ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -16,7 +16,7 @@ unique type Foo type Foo ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -30,7 +30,7 @@ unique type Foo | Baz Nat Nat ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -44,7 +44,7 @@ unique type Foo type Foo ``` -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/update-type-add-field.output.md b/unison-src/transcripts/update-type-add-field.output.md index b96464e02..6741c27a0 100644 --- a/unison-src/transcripts/update-type-add-field.output.md +++ b/unison-src/transcripts/update-type-add-field.output.md @@ -2,7 +2,7 @@ unique type Foo = Bar Nat ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -15,7 +15,7 @@ unique type Foo = Bar Nat type Foo ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -27,7 +27,7 @@ scratch/main> add unique type Foo = Bar Nat Nat ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -41,7 +41,7 @@ unique type Foo = Bar Nat Nat type Foo ``` -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/update-type-add-new-record.output.md b/unison-src/transcripts/update-type-add-new-record.output.md index 4e10132bc..a96ce90c2 100644 --- a/unison-src/transcripts/update-type-add-new-record.output.md +++ b/unison-src/transcripts/update-type-add-new-record.output.md @@ -2,7 +2,7 @@ unique type Foo = { bar : Nat } ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -18,7 +18,7 @@ unique type Foo = { bar : Nat } Foo.bar.set : Nat -> Foo -> Foo ``` -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/update-type-add-record-field.output.md b/unison-src/transcripts/update-type-add-record-field.output.md index 1997eb2ac..23365f09b 100644 --- a/unison-src/transcripts/update-type-add-record-field.output.md +++ b/unison-src/transcripts/update-type-add-record-field.output.md @@ -2,7 +2,7 @@ unique type Foo = { bar : Nat } ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -18,7 +18,7 @@ unique type Foo = { bar : Nat } Foo.bar.set : Nat -> Foo -> Foo ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -33,7 +33,7 @@ scratch/main> add unique type Foo = { bar : Nat, baz : Int } ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -56,7 +56,7 @@ unique type Foo = { bar : Nat, baz : Int } Foo.bar.set : Nat -> Foo -> Foo ``` -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/update-type-constructor-alias.output.md b/unison-src/transcripts/update-type-constructor-alias.output.md index 76291ee05..e8d95fafe 100644 --- a/unison-src/transcripts/update-type-constructor-alias.output.md +++ b/unison-src/transcripts/update-type-constructor-alias.output.md @@ -2,7 +2,7 @@ unique type Foo = Bar Nat ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -15,7 +15,7 @@ unique type Foo = Bar Nat type Foo ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -31,7 +31,7 @@ scratch/main> alias.term Foo.Bar Foo.BarAlias unique type Foo = Bar Nat Nat ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -47,7 +47,7 @@ unique type Foo = Bar Nat Nat ``` Bug: we leave `Foo.BarAlias` in the namespace with a nameless decl. -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/update-type-delete-constructor-with-dependent.output.md b/unison-src/transcripts/update-type-delete-constructor-with-dependent.output.md index 3eca077a5..977866e32 100644 --- a/unison-src/transcripts/update-type-delete-constructor-with-dependent.output.md +++ b/unison-src/transcripts/update-type-delete-constructor-with-dependent.output.md @@ -9,7 +9,7 @@ foo = cases Baz n m -> n + m ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -23,7 +23,7 @@ foo = cases foo : Foo -> Nat ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -37,7 +37,7 @@ unique type Foo = Bar Nat ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -51,7 +51,7 @@ unique type Foo type Foo ``` -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/update-type-delete-constructor.output.md b/unison-src/transcripts/update-type-delete-constructor.output.md index 05d18c259..31afdb7d4 100644 --- a/unison-src/transcripts/update-type-delete-constructor.output.md +++ b/unison-src/transcripts/update-type-delete-constructor.output.md @@ -4,7 +4,7 @@ unique type Foo | Baz Nat Nat ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -17,7 +17,7 @@ unique type Foo type Foo ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -30,7 +30,7 @@ unique type Foo = Bar Nat ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -44,7 +44,7 @@ unique type Foo type Foo ``` -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/update-type-delete-record-field.output.md b/unison-src/transcripts/update-type-delete-record-field.output.md index dcdfa6d51..876edca30 100644 --- a/unison-src/transcripts/update-type-delete-record-field.output.md +++ b/unison-src/transcripts/update-type-delete-record-field.output.md @@ -2,7 +2,7 @@ unique type Foo = { bar : Nat, baz : Int } ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -21,7 +21,7 @@ unique type Foo = { bar : Nat, baz : Int } Foo.baz.set : Int -> Foo -> Foo ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -39,7 +39,7 @@ scratch/main> add unique type Foo = { bar : Nat } ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -58,7 +58,7 @@ unique type Foo = { bar : Nat } ``` We want the field accessors to go away; but for now they are here, causing the update to fail. -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/update-type-missing-constructor.output.md b/unison-src/transcripts/update-type-missing-constructor.output.md index 2344e4319..c9c8bc2ec 100644 --- a/unison-src/transcripts/update-type-missing-constructor.output.md +++ b/unison-src/transcripts/update-type-missing-constructor.output.md @@ -2,7 +2,7 @@ unique type Foo = Bar Nat ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -15,7 +15,7 @@ unique type Foo = Bar Nat type Foo ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -33,7 +33,7 @@ Now we've set up a situation where the original constructor missing. unique type Foo = Bar Nat Nat ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -47,7 +47,7 @@ unique type Foo = Bar Nat Nat type Foo ``` -```ucm +``` ucm scratch/main> view Foo type Foo = #b509v3eg4k#0 Nat diff --git a/unison-src/transcripts/update-type-nested-decl-aliases.output.md b/unison-src/transcripts/update-type-nested-decl-aliases.output.md index e67a1c4b1..706efd641 100644 --- a/unison-src/transcripts/update-type-nested-decl-aliases.output.md +++ b/unison-src/transcripts/update-type-nested-decl-aliases.output.md @@ -5,7 +5,7 @@ structural type A.B = OneAlias Foo structural type A = B.TheOtherAlias Foo ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -20,7 +20,7 @@ structural type A = B.TheOtherAlias Foo type Foo ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -34,7 +34,7 @@ scratch/main> add unique type Foo = Bar Nat Nat ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -52,7 +52,7 @@ Bug: we want this update to be rejected earlier, because it violates the "decl c only one name for each constructor. We instead get too far in the update process, and are delivered a bogus scratch.u file to stare at. -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/update-type-no-op-record.output.md b/unison-src/transcripts/update-type-no-op-record.output.md index 159f9aa86..763a1aba5 100644 --- a/unison-src/transcripts/update-type-no-op-record.output.md +++ b/unison-src/transcripts/update-type-no-op-record.output.md @@ -2,7 +2,7 @@ unique type Foo = { bar : Nat } ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -18,7 +18,7 @@ unique type Foo = { bar : Nat } Foo.bar.set : Nat -> Foo -> Foo ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -31,7 +31,7 @@ scratch/main> add ``` Bug: this no-op update should (of course) succeed. -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/update-type-stray-constructor-alias.output.md b/unison-src/transcripts/update-type-stray-constructor-alias.output.md index 54a1e5965..c6f65667b 100644 --- a/unison-src/transcripts/update-type-stray-constructor-alias.output.md +++ b/unison-src/transcripts/update-type-stray-constructor-alias.output.md @@ -2,7 +2,7 @@ unique type Foo = Bar Nat ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -15,7 +15,7 @@ unique type Foo = Bar Nat type Foo ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -31,7 +31,7 @@ scratch/main> alias.term Foo.Bar Stray.BarAlias unique type Foo = Bar Nat Nat ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -47,7 +47,7 @@ unique type Foo = Bar Nat Nat ``` Bug: we leave `Stray.BarAlias` in the namespace with a nameless decl. -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/update-type-stray-constructor.output.md b/unison-src/transcripts/update-type-stray-constructor.output.md index 999c57ae4..4554fd53d 100644 --- a/unison-src/transcripts/update-type-stray-constructor.output.md +++ b/unison-src/transcripts/update-type-stray-constructor.output.md @@ -2,7 +2,7 @@ unique type Foo = Bar Nat ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -15,7 +15,7 @@ unique type Foo = Bar Nat type Foo ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -33,7 +33,7 @@ Now we've set up a situation where the constructor is not where it's supposed to unique type Foo = Bar Nat Nat ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -49,7 +49,7 @@ unique type Foo = Bar Nat Nat ``` Note that the constructor name shown here (implied to be called `Foo.Stray.Bar`) doesn't really exist, it's just showing up due to a pretty-printer bug. -```ucm +``` ucm scratch/main> view Foo type Foo = Stray.Bar Nat diff --git a/unison-src/transcripts/update-type-turn-constructor-into-smart-constructor.output.md b/unison-src/transcripts/update-type-turn-constructor-into-smart-constructor.output.md index cff0653a0..b6daa8302 100644 --- a/unison-src/transcripts/update-type-turn-constructor-into-smart-constructor.output.md +++ b/unison-src/transcripts/update-type-turn-constructor-into-smart-constructor.output.md @@ -5,7 +5,7 @@ makeFoo : Nat -> Foo makeFoo n = Bar (n+10) ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -19,7 +19,7 @@ makeFoo n = Bar (n+10) makeFoo : Nat -> Foo ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -35,7 +35,7 @@ Foo.Bar : Nat -> Foo Foo.Bar n = internal.Bar n ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -50,7 +50,7 @@ Foo.Bar n = internal.Bar n Foo.Bar : Nat -> Foo ``` -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/update-type-turn-non-record-into-record.output.md b/unison-src/transcripts/update-type-turn-non-record-into-record.output.md index a9a3bf467..edeb85642 100644 --- a/unison-src/transcripts/update-type-turn-non-record-into-record.output.md +++ b/unison-src/transcripts/update-type-turn-non-record-into-record.output.md @@ -2,7 +2,7 @@ unique type Foo = Nat ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -15,7 +15,7 @@ unique type Foo = Nat type Foo ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -27,7 +27,7 @@ scratch/main> add unique type Foo = { bar : Nat } ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -47,7 +47,7 @@ unique type Foo = { bar : Nat } type Foo ``` -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/update-type-with-dependent-term.output.md b/unison-src/transcripts/update-type-with-dependent-term.output.md index 09d0a63f5..b5db3f264 100644 --- a/unison-src/transcripts/update-type-with-dependent-term.output.md +++ b/unison-src/transcripts/update-type-with-dependent-term.output.md @@ -5,7 +5,7 @@ incrFoo : Foo -> Foo incrFoo = cases Bar n -> Bar (n+1) ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -19,7 +19,7 @@ incrFoo = cases Bar n -> Bar (n+1) incrFoo : Foo -> Foo ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -32,7 +32,7 @@ scratch/main> add unique type Foo = Bar Nat Nat ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -46,7 +46,7 @@ unique type Foo = Bar Nat Nat type Foo ``` -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/update-type-with-dependent-type-to-different-kind.output.md b/unison-src/transcripts/update-type-with-dependent-type-to-different-kind.output.md index ea8d65242..8ffbf3b88 100644 --- a/unison-src/transcripts/update-type-with-dependent-type-to-different-kind.output.md +++ b/unison-src/transcripts/update-type-with-dependent-type-to-different-kind.output.md @@ -3,7 +3,7 @@ unique type Foo = Bar Nat unique type Baz = Qux Foo ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -17,7 +17,7 @@ unique type Baz = Qux Foo type Foo ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -30,7 +30,7 @@ scratch/main> add unique type Foo a = Bar Nat a ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -44,7 +44,7 @@ unique type Foo a = Bar Nat a type Foo a ``` -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/update-type-with-dependent-type.output.md b/unison-src/transcripts/update-type-with-dependent-type.output.md index 474a8ceef..6effd150c 100644 --- a/unison-src/transcripts/update-type-with-dependent-type.output.md +++ b/unison-src/transcripts/update-type-with-dependent-type.output.md @@ -3,7 +3,7 @@ unique type Foo = Bar Nat unique type Baz = Qux Foo ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -17,7 +17,7 @@ unique type Baz = Qux Foo type Foo ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -30,7 +30,7 @@ scratch/main> add unique type Foo = Bar Nat Nat ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -44,7 +44,7 @@ unique type Foo = Bar Nat Nat type Foo ``` -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/update-watch.output.md b/unison-src/transcripts/update-watch.output.md index 36bc89ae2..feb53dc17 100644 --- a/unison-src/transcripts/update-watch.output.md +++ b/unison-src/transcripts/update-watch.output.md @@ -2,7 +2,7 @@ > 1 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -18,7 +18,7 @@ 1 ``` -```ucm +``` ucm scratch/main> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/upgrade-happy-path.output.md b/unison-src/transcripts/upgrade-happy-path.output.md index 33c8b6c8d..127b0c489 100644 --- a/unison-src/transcripts/upgrade-happy-path.output.md +++ b/unison-src/transcripts/upgrade-happy-path.output.md @@ -4,7 +4,7 @@ lib.new.foo = 18 thingy = lib.old.foo + 10 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -19,7 +19,7 @@ thingy = lib.old.foo + 10 thingy : Nat ``` -```ucm +``` ucm proj/main> add ⍟ I've added these definitions: @@ -31,7 +31,7 @@ proj/main> add ``` Test tab completion and fzf options of upgrade command. -```ucm +``` ucm proj/main> debug.tab-complete upgrade ol old @@ -51,7 +51,7 @@ proj/main> debug.fuzzy-options upgrade old _ * old ``` -```ucm +``` ucm proj/main> upgrade old new I upgraded old to new, and removed old. diff --git a/unison-src/transcripts/upgrade-sad-path.output.md b/unison-src/transcripts/upgrade-sad-path.output.md index d25d2f8c4..54c7b546c 100644 --- a/unison-src/transcripts/upgrade-sad-path.output.md +++ b/unison-src/transcripts/upgrade-sad-path.output.md @@ -4,7 +4,7 @@ lib.new.foo = +18 thingy = lib.old.foo + 10 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -19,7 +19,7 @@ thingy = lib.old.foo + 10 thingy : Nat ``` -```ucm +``` ucm proj/main> add ⍟ I've added these definitions: @@ -29,7 +29,7 @@ proj/main> add thingy : Nat ``` -```ucm +``` ucm proj/main> upgrade old new I couldn't automatically upgrade old to new. However, I've @@ -62,7 +62,7 @@ Resolve the error and commit the upgrade. thingy = foo + +10 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -76,7 +76,7 @@ thingy = foo + +10 thingy : Int ``` -```ucm +``` ucm proj/upgrade-old-to-new> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/upgrade-suffixifies-properly.output.md b/unison-src/transcripts/upgrade-suffixifies-properly.output.md index cacefecf8..0440acc2a 100644 --- a/unison-src/transcripts/upgrade-suffixifies-properly.output.md +++ b/unison-src/transcripts/upgrade-suffixifies-properly.output.md @@ -8,7 +8,7 @@ d.y.y.y.y = lib.old.foo + 10 bar = a.x.x.x.x + c.y.y.y.y ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -27,7 +27,7 @@ bar = a.x.x.x.x + c.y.y.y.y lib.old.foo : Nat ``` -```ucm +``` ucm myproject/main> add ⍟ I've added these definitions: @@ -41,7 +41,7 @@ myproject/main> add lib.old.foo : Nat ``` -```ucm +``` ucm myproject/main> upgrade old new I couldn't automatically upgrade old to new. However, I've diff --git a/unison-src/transcripts/upgrade-with-old-alias.output.md b/unison-src/transcripts/upgrade-with-old-alias.output.md index 46b073616..9afef6c22 100644 --- a/unison-src/transcripts/upgrade-with-old-alias.output.md +++ b/unison-src/transcripts/upgrade-with-old-alias.output.md @@ -5,7 +5,7 @@ bar = 141 mything = lib.old.foo + 100 ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -21,7 +21,7 @@ mything = lib.old.foo + 100 mything : Nat ``` -```ucm +``` ucm myproject/main> update Okay, I'm searching the branch for code that needs to be diff --git a/unison-src/transcripts/view.output.md b/unison-src/transcripts/view.output.md index c300d96d3..b5cc5149d 100644 --- a/unison-src/transcripts/view.output.md +++ b/unison-src/transcripts/view.output.md @@ -5,7 +5,7 @@ a.thing = "a" b.thing = "b" ``` -```ucm +``` ucm -- Should suffix-search and find values in sub-namespaces .> view thing diff --git a/unison-src/transcripts/watch-expressions.output.md b/unison-src/transcripts/watch-expressions.output.md index 0641ab1a6..096f08e7a 100644 --- a/unison-src/transcripts/watch-expressions.output.md +++ b/unison-src/transcripts/watch-expressions.output.md @@ -1,4 +1,4 @@ -```ucm +``` ucm scratch/main> builtins.mergeio Done. @@ -8,7 +8,7 @@ scratch/main> builtins.mergeio test> pass = [Ok "Passed"] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -28,7 +28,7 @@ test> pass = [Ok "Passed"] ✅ Passed Passed ``` -```ucm +``` ucm scratch/main> add ⍟ I've added these definitions: @@ -40,7 +40,7 @@ scratch/main> add test> pass = [Ok "Passed"] ``` -```ucm +``` ucm Loading changes detected in scratch.u. @@ -55,7 +55,7 @@ test> pass = [Ok "Passed"] ✅ Passed Passed (cached) ``` -```ucm +``` ucm scratch/main> add ⊡ Ignored previously added definitions: pass @@ -76,7 +76,7 @@ scratch/main> test > ImmutableByteArray.fromBytes 0xs123456 ``` -```ucm +``` ucm Loading changes detected in scratch.u.