diff --git a/unison-cli/src/Unison/Codebase/Transcript/Parser.hs b/unison-cli/src/Unison/Codebase/Transcript/Parser.hs index e2f54065dd..cc335e9f7c 100644 --- a/unison-cli/src/Unison/Codebase/Transcript/Parser.hs +++ b/unison-cli/src/Unison/Codebase/Transcript/Parser.hs @@ -145,13 +145,13 @@ nonNewlineSpaces = void $ P.takeWhileP Nothing (\ch -> ch == ' ' || ch == '\t') formatHidden :: Hidden -> Maybe Text formatHidden = \case - HideAll -> pure ":hide:all" + HideAll -> pure ":hide-all" HideOutput -> pure ":hide" Shown -> Nothing hidden :: P Hidden hidden = - (HideAll <$ word ":hide:all") + (HideAll <$ word ":hide-all") <|> (HideOutput <$ word ":hide") <|> pure Shown diff --git a/unison-src/transcripts/alias-many.md b/unison-src/transcripts/alias-many.md index 4cc88d489a..e693e50a5b 100644 --- a/unison-src/transcripts/alias-many.md +++ b/unison-src/transcripts/alias-many.md @@ -1,7 +1,7 @@ ``` ucm :hide scratch/main> builtins.merge lib.builtins ``` -``` unison :hide:all +``` unison :hide-all List.adjacentPairs : [a] -> [(a, a)] List.adjacentPairs as = go xs acc = diff --git a/unison-src/transcripts/errors/info-string-parse-error.output.md b/unison-src/transcripts/errors/info-string-parse-error.output.md index 41dfb5e229..3ef6a22af4 100644 --- a/unison-src/transcripts/errors/info-string-parse-error.output.md +++ b/unison-src/transcripts/errors/info-string-parse-error.output.md @@ -3,4 +3,4 @@ 1 | ``` ucm :hode | ^ unexpected ':' -expecting ":added-by-ucm", ":bug", ":error", ":hide", ":hide:all", or newline +expecting ":added-by-ucm", ":bug", ":error", ":hide", ":hide-all", or newline diff --git a/unison-src/transcripts/errors/missing-result-typed.md b/unison-src/transcripts/errors/missing-result-typed.md index 0e6e52b806..70949bec81 100644 --- a/unison-src/transcripts/errors/missing-result-typed.md +++ b/unison-src/transcripts/errors/missing-result-typed.md @@ -1,6 +1,6 @@ ### Transcript parser hidden errors -When an error is encountered in a `unison :hide:all` block +When an error is encountered in a `unison :hide-all` block then the transcript parser should print the stanza and surface a helpful message. @@ -8,7 +8,7 @@ and surface a helpful message. scratch/main> builtins.merge ``` -``` unison :hide:all +``` unison :hide-all a : Nat a = b = 24 diff --git a/unison-src/transcripts/errors/missing-result-typed.output.md b/unison-src/transcripts/errors/missing-result-typed.output.md index 87c2308bec..7a8ee5ba80 100644 --- a/unison-src/transcripts/errors/missing-result-typed.output.md +++ b/unison-src/transcripts/errors/missing-result-typed.output.md @@ -1,6 +1,6 @@ ### Transcript parser hidden errors -When an error is encountered in a `unison :hide:all` block +When an error is encountered in a `unison :hide-all` block then the transcript parser should print the stanza and surface a helpful message. @@ -8,7 +8,7 @@ and surface a helpful message. scratch/main> builtins.merge ``` -``` unison :hide:all +``` unison :hide-all a : Nat a = b = 24 @@ -18,7 +18,7 @@ a = The transcript failed due to an error in the stanza above. The error is: -``` +``` The last element of a block must be an expression, but this is a definition: diff --git a/unison-src/transcripts/errors/missing-result.md b/unison-src/transcripts/errors/missing-result.md index f177ee81c8..a94c3bb3c5 100644 --- a/unison-src/transcripts/errors/missing-result.md +++ b/unison-src/transcripts/errors/missing-result.md @@ -1,10 +1,10 @@ ### Transcript parser hidden errors -When an error is encountered in a `unison :hide:all` block +When an error is encountered in a `unison :hide-all` block then the transcript parser should print the stanza and surface a helpful message. -``` unison :hide:all +``` unison :hide-all x = y = 24 ``` diff --git a/unison-src/transcripts/errors/missing-result.output.md b/unison-src/transcripts/errors/missing-result.output.md index fb0ab98c9f..c6d75598b9 100644 --- a/unison-src/transcripts/errors/missing-result.output.md +++ b/unison-src/transcripts/errors/missing-result.output.md @@ -1,10 +1,10 @@ ### Transcript parser hidden errors -When an error is encountered in a `unison :hide:all` block +When an error is encountered in a `unison :hide-all` block then the transcript parser should print the stanza and surface a helpful message. -``` unison :hide:all +``` unison :hide-all x = y = 24 ``` @@ -13,7 +13,7 @@ x = The transcript failed due to an error in the stanza above. The error is: -``` +``` The last element of a block must be an expression, but this is a definition: diff --git a/unison-src/transcripts/errors/ucm-hide-all-error.md b/unison-src/transcripts/errors/ucm-hide-all-error.md index 7444155923..7a56730f69 100644 --- a/unison-src/transcripts/errors/ucm-hide-all-error.md +++ b/unison-src/transcripts/errors/ucm-hide-all-error.md @@ -2,10 +2,10 @@ Dangerous scary words! -When an expected error is not encountered in a `ucm :hide:all` block +When an expected error is not encountered in a `ucm :hide-all` block then the transcript parser should print the stanza and surface a helpful message. -``` ucm :hide:all:error +``` ucm :hide-all :error scratch/main> history ``` diff --git a/unison-src/transcripts/errors/ucm-hide-all-error.output.md b/unison-src/transcripts/errors/ucm-hide-all-error.output.md index 35770aff86..6f7c903cbd 100644 --- a/unison-src/transcripts/errors/ucm-hide-all-error.output.md +++ b/unison-src/transcripts/errors/ucm-hide-all-error.output.md @@ -2,11 +2,11 @@ Dangerous scary words\! -When an expected error is not encountered in a `ucm :hide:all` block +When an expected error is not encountered in a `ucm :hide-all` block then the transcript parser should print the stanza and surface a helpful message. -``` ucm :hide:all :error +``` ucm :hide-all :error scratch/main> history ``` diff --git a/unison-src/transcripts/errors/ucm-hide-all.md b/unison-src/transcripts/errors/ucm-hide-all.md index cb79d26753..a3e6d3443f 100644 --- a/unison-src/transcripts/errors/ucm-hide-all.md +++ b/unison-src/transcripts/errors/ucm-hide-all.md @@ -2,10 +2,10 @@ Dangerous scary words! -When an error is encountered in a `ucm :hide:all` block +When an error is encountered in a `ucm :hide-all` block then the transcript parser should print the stanza and surface a helpful message. -``` ucm :hide:all +``` ucm :hide-all scratch/main> move.namespace foo bar ``` diff --git a/unison-src/transcripts/errors/ucm-hide-all.output.md b/unison-src/transcripts/errors/ucm-hide-all.output.md index 2753dd7f11..fc6d21cbc6 100644 --- a/unison-src/transcripts/errors/ucm-hide-all.output.md +++ b/unison-src/transcripts/errors/ucm-hide-all.output.md @@ -2,11 +2,11 @@ Dangerous scary words\! -When an error is encountered in a `ucm :hide:all` block +When an error is encountered in a `ucm :hide-all` block then the transcript parser should print the stanza and surface a helpful message. -``` ucm :hide:all +``` ucm :hide-all scratch/main> move.namespace foo bar ``` diff --git a/unison-src/transcripts/errors/unison-hide-all-error.md b/unison-src/transcripts/errors/unison-hide-all-error.md index e35de94e1d..ca2bd023ba 100644 --- a/unison-src/transcripts/errors/unison-hide-all-error.md +++ b/unison-src/transcripts/errors/unison-hide-all-error.md @@ -1,9 +1,9 @@ ### Transcript parser hidden errors -When an expected error is not encountered in a `unison :hide:all:error` block +When an expected error is not encountered in a `unison :hide-all :error` block then the transcript parser should print the stanza and surface a helpful message. -``` unison :hide:all:error +``` unison :hide-all :error myVal = 3 ``` diff --git a/unison-src/transcripts/errors/unison-hide-all-error.output.md b/unison-src/transcripts/errors/unison-hide-all-error.output.md index 94aeb9cf66..6205069903 100644 --- a/unison-src/transcripts/errors/unison-hide-all-error.output.md +++ b/unison-src/transcripts/errors/unison-hide-all-error.output.md @@ -1,10 +1,10 @@ ### Transcript parser hidden errors -When an expected error is not encountered in a `unison :hide:all:error` block +When an expected error is not encountered in a `unison :hide-all :error` block then the transcript parser should print the stanza and surface a helpful message. -``` unison :hide:all :error +``` unison :hide-all :error myVal = 3 ``` diff --git a/unison-src/transcripts/errors/unison-hide-all.md b/unison-src/transcripts/errors/unison-hide-all.md index 48907e75e7..9288252881 100644 --- a/unison-src/transcripts/errors/unison-hide-all.md +++ b/unison-src/transcripts/errors/unison-hide-all.md @@ -1,9 +1,9 @@ ### Transcript parser hidden errors -When an error is encountered in a `unison :hide:all` block +When an error is encountered in a `unison :hide-all` block then the transcript parser should print the stanza and surface a helpful message. -``` unison :hide:all +``` unison :hide-all g 3 ``` diff --git a/unison-src/transcripts/errors/unison-hide-all.output.md b/unison-src/transcripts/errors/unison-hide-all.output.md index c27b7dd28f..89cd4724b7 100644 --- a/unison-src/transcripts/errors/unison-hide-all.output.md +++ b/unison-src/transcripts/errors/unison-hide-all.output.md @@ -1,10 +1,10 @@ ### Transcript parser hidden errors -When an error is encountered in a `unison :hide:all` block +When an error is encountered in a `unison :hide-all` block then the transcript parser should print the stanza and surface a helpful message. -``` unison :hide:all +``` unison :hide-all g 3 ``` diff --git a/unison-src/transcripts/fix2840.md b/unison-src/transcripts/fix2840.md index 6c6ac6abe9..31d4c103df 100644 --- a/unison-src/transcripts/fix2840.md +++ b/unison-src/transcripts/fix2840.md @@ -6,7 +6,7 @@ scratch/main> builtins.merge First, a few \[hidden] definitions necessary for typechecking a simple Doc2. -``` unison :hide:all +``` unison :hide-all structural type Optional a = None | Some a unique[b7a4fb87e34569319591130bf3ec6e24c9955b6a] type Doc2 diff --git a/unison-src/transcripts/hello.md b/unison-src/transcripts/hello.md index 7f5937a353..566e6b5694 100644 --- a/unison-src/transcripts/hello.md +++ b/unison-src/transcripts/hello.md @@ -52,9 +52,9 @@ This works for `ucm` blocks as well. scratch/main> rename.term x answerToUltimateQuestionOfLife ``` -Doing `unison :hide:all` hides the block altogether, both input and output - this is useful for doing behind-the-scenes control of `ucm`'s state. +Doing `unison :hide-all` hides the block altogether, both input and output - this is useful for doing behind-the-scenes control of `ucm`'s state. -``` unison :hide:all +``` unison :hide-all > [: you won't see me :] ``` diff --git a/unison-src/transcripts/hello.output.md b/unison-src/transcripts/hello.output.md index b6b1811758..9ab978d5ce 100644 --- a/unison-src/transcripts/hello.output.md +++ b/unison-src/transcripts/hello.output.md @@ -72,7 +72,7 @@ This works for `ucm` blocks as well. scratch/main> rename.term x answerToUltimateQuestionOfLife ``` -Doing `unison :hide:all` hides the block altogether, both input and output - this is useful for doing behind-the-scenes control of `ucm`'s state. +Doing `unison :hide-all` hides the block altogether, both input and output - this is useful for doing behind-the-scenes control of `ucm`'s state. ## Expecting failures diff --git a/unison-src/transcripts/merge.md b/unison-src/transcripts/merge.md index 6b759f44ce..7bbbd16cf6 100644 --- a/unison-src/transcripts/merge.md +++ b/unison-src/transcripts/merge.md @@ -870,7 +870,7 @@ scratch/alice> delete.term Foo.Bar.Baz scratch/alice> delete.term Foo.Bar.Qux ``` -``` unison :hide:all +``` unison :hide-all Foo.Bar.Baz : Nat Foo.Bar.Baz = 100 @@ -1301,7 +1301,7 @@ Alice's branch: scratch/main> branch alice ``` -``` unison :hide:all +``` unison :hide-all unique type Foo = Bar ``` @@ -1315,7 +1315,7 @@ Bob's branch: scratch/main> branch bob ``` -``` unison :hide:all +``` unison :hide-all bob : Nat bob = 101 ``` diff --git a/unison-src/transcripts/no-hash-in-term-declaration.md b/unison-src/transcripts/no-hash-in-term-declaration.md index 493c2f32ce..85ef6c0de2 100644 --- a/unison-src/transcripts/no-hash-in-term-declaration.md +++ b/unison-src/transcripts/no-hash-in-term-declaration.md @@ -2,7 +2,7 @@ There should not be hashes in the names used in term declarations, either in the type signature or the type definition. -``` unison :hide:all:error +``` unison :hide-all :error x##Nat : Int -> Int -> Boolean x##Nat = 5 ```