unisonweb/unison
1
0
Fork 0
mirror of https://github.com/unisonweb/unison.git synced 2024-09-11 10:35:57 +03:00
Code Issues Projects Releases Wiki Activity
trunk
unison/unison-src/transcripts/definition-diff-api.output.md

3603 lines
106 KiB
Markdown
Raw Permalink Normal View History

Add a space before code block info strings This is for consistency with the `cmark` style. Now the blocks we still pretty-print ourselves will match the bulk of them that `cmark` produces.
2024-07-10 19:17:15 +03:00
``` ucm
Add regression test
2024-08-09 20:21:19 +03:00
diffs/main> builtins.mergeio lib.builtins
Done.
diffs/main> alias.term lib.builtins.Nat.gt lib.builtins.Nat.>
Done.
diffs/main> alias.term lib.builtins.Nat.drop lib.builtins.Nat.-
Add definition diff apis and tests
2024-05-17 19:43:19 +03:00
Done.
```
Update the transcripts with `cmark` `cmark`’s pretty-printer matches our output pretty well, with a few differences: - it puts a space between the fence and the info string for in code blocks; - it prefers `-` over `*` for bulleted lists (as do I) and it indents them; - it `\`-escapes certain chars very conservatively; - it prefers indented/unfenced code blocks if there is no info string; and - it prefers `*` over `_` (unlike any sane person). This also shows how the change fixes a number of issues: - fix2158-1.output.md also illustrates how this change fixes #1809; - alias-many.output.md and input-parse-errors.output.md show how fenced code blocks without an info string would use the beginning of the content as the info string; - transcripts-round-trip/main.output.md shows how output blocks for generated `unison` stanzas (which could contain nested fenced blocks) might not have long-enough fences; and - error-messages.output.md and generic-parse-errors.output.md show how Unison errors were reported on the wrong line number (and thus the printed error lines were also incorrect).
2024-07-10 17:46:18 +03:00
``` unison
Auto-create project-branches referenced in transcript prompts (#5077)
2024-06-12 16:28:12 +03:00
term =
Add definition diff apis and tests
2024-05-17 19:43:19 +03:00
_ = "Here's some text"
1 + 1
type Type = Type Nat
Add regression test
2024-08-09 20:21:19 +03:00
ability Stream a where
emit : a -> ()
take n s =
use Nat > -
h n = cases
{ emit a -> k } -> if n > 0
then
emit a
handle k() with h (n - 1)
else None
{ r } -> Some r
handle s() with h n
Add definition diff apis and tests
2024-05-17 19:43:19 +03:00
```
Add a space before code block info strings This is for consistency with the `cmark` style. Now the blocks we still pretty-print ourselves will match the bulk of them that `cmark` produces.
2024-07-10 19:17:15 +03:00
``` ucm
Add definition diff apis and tests
2024-05-17 19:43:19 +03:00
Loading changes detected in scratch.u.
I found and typechecked these definitions in scratch.u. If you
do an `add` or `update`, here's how your codebase would
change:
⍟ These new definitions are ok to `add`:
Add regression test
2024-08-09 20:21:19 +03:00
ability Stream a
Add definition diff apis and tests
2024-05-17 19:43:19 +03:00
type Type
Add regression test
2024-08-09 20:21:19 +03:00
take : Nat -> '{g} t ->{g, Stream a} Optional t
Add definition diff apis and tests
2024-05-17 19:43:19 +03:00
term : Nat
```
Add a space before code block info strings This is for consistency with the `cmark` style. Now the blocks we still pretty-print ourselves will match the bulk of them that `cmark` produces.
2024-07-10 19:17:15 +03:00
``` ucm
Add definition diff apis and tests
2024-05-17 19:43:19 +03:00
diffs/main> add
⍟ I've added these definitions:
Add regression test
2024-08-09 20:21:19 +03:00
ability Stream a
Add definition diff apis and tests
2024-05-17 19:43:19 +03:00
type Type
Add regression test
2024-08-09 20:21:19 +03:00
take : Nat -> '{g} t ->{g, Stream a} Optional t
Add definition diff apis and tests
2024-05-17 19:43:19 +03:00
term : Nat
diffs/main> branch.create new
Done. I've created the new branch based off of main.
transcript output merge conflict
2024-05-19 06:42:51 +03:00
Tip: To merge your work back into the main branch, first
`switch /main` then `merge /new`.
Add definition diff apis and tests
2024-05-17 19:43:19 +03:00
```
Update the transcripts with `cmark` `cmark`’s pretty-printer matches our output pretty well, with a few differences: - it puts a space between the fence and the info string for in code blocks; - it prefers `-` over `*` for bulleted lists (as do I) and it indents them; - it `\`-escapes certain chars very conservatively; - it prefers indented/unfenced code blocks if there is no info string; and - it prefers `*` over `_` (unlike any sane person). This also shows how the change fixes a number of issues: - fix2158-1.output.md also illustrates how this change fixes #1809; - alias-many.output.md and input-parse-errors.output.md show how fenced code blocks without an info string would use the beginning of the content as the info string; - transcripts-round-trip/main.output.md shows how output blocks for generated `unison` stanzas (which could contain nested fenced blocks) might not have long-enough fences; and - error-messages.output.md and generic-parse-errors.output.md show how Unison errors were reported on the wrong line number (and thus the printed error lines were also incorrect).
2024-07-10 17:46:18 +03:00
``` unison
Auto-create project-branches referenced in transcript prompts (#5077)
2024-06-12 16:28:12 +03:00
term =
Add definition diff apis and tests
2024-05-17 19:43:19 +03:00
_ = "Here's some different text"
1 + 2
type Type a = Type a Text
Add regression test
2024-08-09 20:21:19 +03:00
ability Stream a where
emit : a -> ()
take n s =
use Nat > -
h n = cases
{ emit a -> k } ->
emit a
if n > 0
then handle k() with h (n - 1)
else None
{ r } -> Some r
if n > 0
then handle s () with h (n - 1)
else None
Add definition diff apis and tests
2024-05-17 19:43:19 +03:00
```
Add a space before code block info strings This is for consistency with the `cmark` style. Now the blocks we still pretty-print ourselves will match the bulk of them that `cmark` produces.
2024-07-10 19:17:15 +03:00
``` ucm
Add definition diff apis and tests
2024-05-17 19:43:19 +03:00
Loading changes detected in scratch.u.
I found and typechecked these definitions in scratch.u. If you
do an `add` or `update`, here's how your codebase would
change:
Add regression test
2024-08-09 20:21:19 +03:00
⊡ Previously added definitions will be ignored: Stream
Add definition diff apis and tests
2024-05-17 19:43:19 +03:00
⍟ These names already exist. You can `update` them to your
new definition:
type Type a
Add regression test
2024-08-09 20:21:19 +03:00
take : Nat -> '{g} t ->{g, Stream a} Optional t
Add definition diff apis and tests
2024-05-17 19:43:19 +03:00
term : Nat
```
Add a space before code block info strings This is for consistency with the `cmark` style. Now the blocks we still pretty-print ourselves will match the bulk of them that `cmark` produces.
2024-07-10 19:17:15 +03:00
``` ucm
Add definition diff apis and tests
2024-05-17 19:43:19 +03:00
diffs/new> update
Okay, I'm searching the branch for code that needs to be
updated...
Done.
```
Transcripts
2024-05-18 05:08:11 +03:00
Diff terms
Add a space before code block info strings This is for consistency with the `cmark` style. Now the blocks we still pretty-print ourselves will match the bulk of them that `cmark` produces.
2024-07-10 19:17:15 +03:00
``` api
Add definition diff apis and tests
2024-05-17 19:43:19 +03:00
GET /api/projects/diffs/diff/terms?oldBranchRef=main&newBranchRef=new&oldTerm=term&newTerm=term
{
"diff": {
"contents": [
{
"diffTag": "both",
"elements": [
{
"annotation": {
"contents": "term",
"tag": "HashQualifier"
},
"segment": "term"
},
{
"annotation": {
"tag": "TypeAscriptionColon"
},
"segment": " :"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "##Nat",
"tag": "TypeReference"
},
"segment": "Nat"
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": {
"contents": "term",
"tag": "HashQualifier"
},
"segment": "term"
},
{
"annotation": {
"tag": "BindingEquals"
},
"segment": " ="
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "UseKeyword"
},
"segment": "use "
},
{
"annotation": {
"tag": "UsePrefix"
},
"segment": "Nat"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "UseSuffix"
},
"segment": "+"
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "_",
"tag": "HashQualifier"
},
"segment": "_"
},
{
"annotation": {
"tag": "BindingEquals"
},
"segment": " ="
},
{
"annotation": null,
"segment": " "
}
]
},
{
"annotation": {
"tag": "TextLiteral"
},
"diffTag": "segmentChange",
"fromSegment": "\"Here's some text\"",
"toSegment": "\"Here's some different text\""
},
{
"diffTag": "both",
"elements": [
{
"annotation": null,
"segment": "\n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "NumericLiteral"
},
"segment": "1"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "##Nat.+",
"tag": "TermReference"
},
"segment": "+"
},
{
"annotation": null,
"segment": " "
}
]
},
{
"annotation": {
"tag": "NumericLiteral"
},
"diffTag": "segmentChange",
"fromSegment": "1",
"toSegment": "2"
}
],
"tag": "UserObject"
},
"diffKind": "diff",
"newBranchRef": "new",
"newTerm": {
"bestTermName": "term",
"defnTermTag": "Plain",
"signature": [
{
"annotation": {
"contents": "##Nat",
"tag": "TypeReference"
},
"segment": "Nat"
}
],
"termDefinition": {
"contents": [
{
"annotation": {
"contents": "term",
"tag": "HashQualifier"
},
"segment": "term"
},
{
"annotation": {
"tag": "TypeAscriptionColon"
},
"segment": " :"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "##Nat",
"tag": "TypeReference"
},
"segment": "Nat"
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": {
"contents": "term",
"tag": "HashQualifier"
},
"segment": "term"
},
{
"annotation": {
"tag": "BindingEquals"
},
"segment": " ="
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "UseKeyword"
},
"segment": "use "
},
{
"annotation": {
"tag": "UsePrefix"
},
"segment": "Nat"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "UseSuffix"
},
"segment": "+"
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "_",
"tag": "HashQualifier"
},
"segment": "_"
},
{
"annotation": {
"tag": "BindingEquals"
},
"segment": " ="
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "TextLiteral"
},
"segment": "\"Here's some different text\""
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "NumericLiteral"
},
"segment": "1"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "##Nat.+",
"tag": "TermReference"
},
"segment": "+"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "NumericLiteral"
},
"segment": "2"
}
],
"tag": "UserObject"
},
"termDocs": [],
"termNames": [
"term"
]
},
"oldBranchRef": "main",
"oldTerm": {
"bestTermName": "term",
"defnTermTag": "Plain",
"signature": [
{
"annotation": {
"contents": "##Nat",
"tag": "TypeReference"
},
"segment": "Nat"
}
],
"termDefinition": {
"contents": [
{
"annotation": {
"contents": "term",
"tag": "HashQualifier"
},
"segment": "term"
},
{
"annotation": {
"tag": "TypeAscriptionColon"
},
"segment": " :"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "##Nat",
"tag": "TypeReference"
},
"segment": "Nat"
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": {
"contents": "term",
"tag": "HashQualifier"
},
"segment": "term"
},
{
"annotation": {
"tag": "BindingEquals"
},
"segment": " ="
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "UseKeyword"
},
"segment": "use "
},
{
"annotation": {
"tag": "UsePrefix"
},
"segment": "Nat"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "UseSuffix"
},
"segment": "+"
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "_",
"tag": "HashQualifier"
},
"segment": "_"
},
{
"annotation": {
"tag": "BindingEquals"
},
"segment": " ="
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "TextLiteral"
},
"segment": "\"Here's some text\""
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "NumericLiteral"
},
"segment": "1"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "##Nat.+",
"tag": "TermReference"
},
"segment": "+"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "NumericLiteral"
},
"segment": "1"
}
],
"tag": "UserObject"
},
"termDocs": [],
"termNames": [
"term"
]
},
"project": "diffs"
}
Terminate API code blocks correctly They were missing trailing newlines, so as you can see in the diff, some transcripts had invalid output.
2024-07-10 22:15:33 +03:00
```
Add regression test
2024-08-09 20:21:19 +03:00
More complex diff
``` api
GET /api/projects/diffs/diff/terms?oldBranchRef=main&newBranchRef=new&oldTerm=take&newTerm=take
{
"diff": {
"contents": [
{
"diffTag": "both",
"elements": [
{
"annotation": {
"contents": "take",
"tag": "HashQualifier"
},
"segment": "take"
},
{
"annotation": {
"tag": "TypeAscriptionColon"
},
"segment": " :"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "##Nat",
"tag": "TypeReference"
},
"segment": "Nat"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "TypeOperator"
},
"segment": "->"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "DelayForceChar"
},
"segment": "'"
},
{
"annotation": {
"tag": "AbilityBraces"
},
"segment": "{"
},
{
"annotation": {
"tag": "Var"
},
"segment": "g"
},
{
"annotation": {
"tag": "AbilityBraces"
},
"segment": "}"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "t"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "TypeOperator"
},
"segment": "->"
},
{
"annotation": {
"tag": "AbilityBraces"
},
"segment": "{"
},
{
"annotation": {
"tag": "Var"
},
"segment": "g"
},
{
"annotation": null,
"segment": ","
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "#b035k0tpdv9jbs80ig29hujmv9kpkubda6or4320o5g7aj7edsudislnp2uovntgu5b0e6a18p0p7j8r2hcpr20blls7am8nll6t2ro",
"tag": "TypeReference"
},
"segment": "Stream"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "a"
},
{
"annotation": {
"tag": "AbilityBraces"
},
"segment": "}"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "#nirp5os0q69o4e1u9p3t6mmq6l6otluefi3ksm7dhm0diidjvkkgl8o9bvnflbj0sanuvdusf34f1qrins3ktcaglpcqv9oums2slsg",
"tag": "TypeReference"
},
"segment": "Optional"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "t"
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": {
"contents": "take",
"tag": "HashQualifier"
},
"segment": "take"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "s"
},
{
"annotation": {
"tag": "BindingEquals"
},
"segment": " ="
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "UseKeyword"
},
"segment": "use "
},
{
"annotation": {
"tag": "UsePrefix"
},
"segment": "Nat"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "UseSuffix"
},
"segment": "-"
},
{
"annotation": {
"tag": "UseSuffix"
},
"segment": " "
},
{
"annotation": {
"tag": "UseSuffix"
},
"segment": ">"
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "h",
"tag": "HashQualifier"
},
"segment": "h"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "n"
},
{
"annotation": {
"tag": "BindingEquals"
},
"segment": " ="
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": "cases"
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "DelimiterChar"
},
"segment": "{"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "#b035k0tpdv9jbs80ig29hujmv9kpkubda6or4320o5g7aj7edsudislnp2uovntgu5b0e6a18p0p7j8r2hcpr20blls7am8nll6t2ro#a0",
"tag": "TermReference"
},
"segment": "emit"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "a"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": "->"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "k"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "DelimiterChar"
},
"segment": "}"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": "->"
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": null,
"segment": " "
},
{
"annotation": null,
"segment": " "
}
]
},
{
"diffTag": "old",
"elements": [
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": "if "
},
{
"annotation": {
"tag": "Var"
},
"segment": "n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "##Nat.>",
"tag": "TermReference"
},
"segment": ">"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "NumericLiteral"
},
"segment": "0"
},
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": " then"
}
]
},
{
"diffTag": "new",
"elements": [
{
"annotation": {
"contents": "#b035k0tpdv9jbs80ig29hujmv9kpkubda6or4320o5g7aj7edsudislnp2uovntgu5b0e6a18p0p7j8r2hcpr20blls7am8nll6t2ro#a0",
"tag": "TermReference"
},
"segment": "emit"
}
]
},
{
"annotation": null,
"diffTag": "segmentChange",
"fromSegment": "\n",
"toSegment": " "
},
{
"diffTag": "new",
"elements": [
{
"annotation": {
"tag": "Var"
},
"segment": "a"
}
]
},
{
"annotation": null,
"diffTag": "segmentChange",
"fromSegment": " ",
"toSegment": "\n"
},
{
"diffTag": "both",
"elements": [
{
"annotation": null,
"segment": " "
},
{
"annotation": null,
"segment": " "
},
{
"annotation": null,
"segment": " "
}
]
},
{
"diffTag": "old",
"elements": [
{
"annotation": {
"contents": "#b035k0tpdv9jbs80ig29hujmv9kpkubda6or4320o5g7aj7edsudislnp2uovntgu5b0e6a18p0p7j8r2hcpr20blls7am8nll6t2ro#a0",
"tag": "TermReference"
},
"segment": "emit"
}
]
},
{
"diffTag": "new",
"elements": [
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": "if"
}
]
},
{
"diffTag": "both",
"elements": [
{
"annotation": null,
"segment": " "
}
]
},
{
"annotation": {
"tag": "Var"
},
"diffTag": "segmentChange",
"fromSegment": "a",
"toSegment": "n"
},
{
"annotation": null,
"diffTag": "segmentChange",
"fromSegment": "\n",
"toSegment": " "
},
{
"diffTag": "old",
"elements": [
{
"annotation": null,
"segment": " "
},
{
"annotation": null,
"segment": " "
}
]
},
{
"diffTag": "new",
"elements": [
{
"annotation": {
"contents": "##Nat.>",
"tag": "TermReference"
},
"segment": ">"
}
]
},
{
"annotation": null,
"diffTag": "segmentChange",
"fromSegment": " ",
"toSegment": " "
},
{
"diffTag": "new",
"elements": [
{
"annotation": {
"tag": "NumericLiteral"
},
"segment": "0"
},
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": " then"
}
]
},
{
"annotation": null,
"diffTag": "segmentChange",
"fromSegment": " ",
"toSegment": " "
},
{
"diffTag": "both",
"elements": [
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": "handle"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "k"
},
{
"annotation": {
"tag": "Unit"
},
"segment": "()"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": "with"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "h"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Parenthesis"
},
"segment": "("
},
{
"annotation": {
"tag": "Var"
},
"segment": "n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "##Nat.drop",
"tag": "TermReference"
},
"segment": "-"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "NumericLiteral"
},
"segment": "1"
},
{
"annotation": {
"tag": "Parenthesis"
},
"segment": ")"
}
]
},
{
"annotation": null,
"diffTag": "segmentChange",
"fromSegment": "\n",
"toSegment": " "
},
{
"diffTag": "old",
"elements": [
{
"annotation": null,
"segment": " "
},
{
"annotation": null,
"segment": " "
},
{
"annotation": null,
"segment": " "
}
]
},
{
"diffTag": "both",
"elements": [
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": "else"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "#nirp5os0q69o4e1u9p3t6mmq6l6otluefi3ksm7dhm0diidjvkkgl8o9bvnflbj0sanuvdusf34f1qrins3ktcaglpcqv9oums2slsg#d1",
"tag": "TermReference"
},
"segment": "None"
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "DelimiterChar"
},
"segment": "{"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "r"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "DelimiterChar"
},
"segment": "}"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": "->"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "#nirp5os0q69o4e1u9p3t6mmq6l6otluefi3ksm7dhm0diidjvkkgl8o9bvnflbj0sanuvdusf34f1qrins3ktcaglpcqv9oums2slsg#d0",
"tag": "TermReference"
},
"segment": "Some"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "r"
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": null,
"segment": " "
}
]
},
{
"annotation": {
"tag": "ControlKeyword"
},
"diffTag": "segmentChange",
"fromSegment": "handle",
"toSegment": "if"
},
{
"diffTag": "both",
"elements": [
{
"annotation": null,
"segment": " "
}
]
},
{
"annotation": {
"tag": "Var"
},
"diffTag": "segmentChange",
"fromSegment": "s",
"toSegment": "n"
},
{
"diffTag": "new",
"elements": [
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "##Nat.>",
"tag": "TermReference"
},
"segment": ">"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "NumericLiteral"
},
"segment": "0"
},
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": " then"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": "handle"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "s"
}
]
},
{
"diffTag": "both",
"elements": [
{
"annotation": {
"tag": "Unit"
},
"segment": "()"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": "with"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "h"
},
{
"annotation": null,
"segment": " "
}
]
},
{
"diffTag": "new",
"elements": [
{
"annotation": {
"tag": "Parenthesis"
},
"segment": "("
}
]
},
{
"diffTag": "both",
"elements": [
{
"annotation": {
"tag": "Var"
},
"segment": "n"
}
]
},
{
"diffTag": "new",
"elements": [
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "##Nat.drop",
"tag": "TermReference"
},
"segment": "-"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "NumericLiteral"
},
"segment": "1"
},
{
"annotation": {
"tag": "Parenthesis"
},
"segment": ")"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": "else"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "#nirp5os0q69o4e1u9p3t6mmq6l6otluefi3ksm7dhm0diidjvkkgl8o9bvnflbj0sanuvdusf34f1qrins3ktcaglpcqv9oums2slsg#d1",
"tag": "TermReference"
},
"segment": "None"
}
]
}
],
"tag": "UserObject"
},
"diffKind": "diff",
"newBranchRef": "new",
"newTerm": {
"bestTermName": "take",
"defnTermTag": "Plain",
"signature": [
{
"annotation": {
"contents": "##Nat",
"tag": "TypeReference"
},
"segment": "Nat"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "TypeOperator"
},
"segment": "->"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "DelayForceChar"
},
"segment": "'"
},
{
"annotation": {
"tag": "AbilityBraces"
},
"segment": "{"
},
{
"annotation": {
"tag": "Var"
},
"segment": "g"
},
{
"annotation": {
"tag": "AbilityBraces"
},
"segment": "}"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "t"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "TypeOperator"
},
"segment": "->"
},
{
"annotation": {
"tag": "AbilityBraces"
},
"segment": "{"
},
{
"annotation": {
"tag": "Var"
},
"segment": "g"
},
{
"annotation": null,
"segment": ","
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "#b035k0tpdv9jbs80ig29hujmv9kpkubda6or4320o5g7aj7edsudislnp2uovntgu5b0e6a18p0p7j8r2hcpr20blls7am8nll6t2ro",
"tag": "TypeReference"
},
"segment": "Stream"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "a"
},
{
"annotation": {
"tag": "AbilityBraces"
},
"segment": "}"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "#nirp5os0q69o4e1u9p3t6mmq6l6otluefi3ksm7dhm0diidjvkkgl8o9bvnflbj0sanuvdusf34f1qrins3ktcaglpcqv9oums2slsg",
"tag": "TypeReference"
},
"segment": "Optional"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "t"
}
],
"termDefinition": {
"contents": [
{
"annotation": {
"contents": "take",
"tag": "HashQualifier"
},
"segment": "take"
},
{
"annotation": {
"tag": "TypeAscriptionColon"
},
"segment": " :"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "##Nat",
"tag": "TypeReference"
},
"segment": "Nat"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "TypeOperator"
},
"segment": "->"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "DelayForceChar"
},
"segment": "'"
},
{
"annotation": {
"tag": "AbilityBraces"
},
"segment": "{"
},
{
"annotation": {
"tag": "Var"
},
"segment": "g"
},
{
"annotation": {
"tag": "AbilityBraces"
},
"segment": "}"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "t"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "TypeOperator"
},
"segment": "->"
},
{
"annotation": {
"tag": "AbilityBraces"
},
"segment": "{"
},
{
"annotation": {
"tag": "Var"
},
"segment": "g"
},
{
"annotation": null,
"segment": ","
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "#b035k0tpdv9jbs80ig29hujmv9kpkubda6or4320o5g7aj7edsudislnp2uovntgu5b0e6a18p0p7j8r2hcpr20blls7am8nll6t2ro",
"tag": "TypeReference"
},
"segment": "Stream"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "a"
},
{
"annotation": {
"tag": "AbilityBraces"
},
"segment": "}"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "#nirp5os0q69o4e1u9p3t6mmq6l6otluefi3ksm7dhm0diidjvkkgl8o9bvnflbj0sanuvdusf34f1qrins3ktcaglpcqv9oums2slsg",
"tag": "TypeReference"
},
"segment": "Optional"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "t"
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": {
"contents": "take",
"tag": "HashQualifier"
},
"segment": "take"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "s"
},
{
"annotation": {
"tag": "BindingEquals"
},
"segment": " ="
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "UseKeyword"
},
"segment": "use "
},
{
"annotation": {
"tag": "UsePrefix"
},
"segment": "Nat"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "UseSuffix"
},
"segment": "-"
},
{
"annotation": {
"tag": "UseSuffix"
},
"segment": " "
},
{
"annotation": {
"tag": "UseSuffix"
},
"segment": ">"
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "h",
"tag": "HashQualifier"
},
"segment": "h"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "n"
},
{
"annotation": {
"tag": "BindingEquals"
},
"segment": " ="
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": "cases"
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "DelimiterChar"
},
"segment": "{"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "#b035k0tpdv9jbs80ig29hujmv9kpkubda6or4320o5g7aj7edsudislnp2uovntgu5b0e6a18p0p7j8r2hcpr20blls7am8nll6t2ro#a0",
"tag": "TermReference"
},
"segment": "emit"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "a"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": "->"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "k"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "DelimiterChar"
},
"segment": "}"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": "->"
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": null,
"segment": " "
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "#b035k0tpdv9jbs80ig29hujmv9kpkubda6or4320o5g7aj7edsudislnp2uovntgu5b0e6a18p0p7j8r2hcpr20blls7am8nll6t2ro#a0",
"tag": "TermReference"
},
"segment": "emit"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "a"
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": null,
"segment": " "
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": "if"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "##Nat.>",
"tag": "TermReference"
},
"segment": ">"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "NumericLiteral"
},
"segment": "0"
},
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": " then"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": "handle"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "k"
},
{
"annotation": {
"tag": "Unit"
},
"segment": "()"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": "with"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "h"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Parenthesis"
},
"segment": "("
},
{
"annotation": {
"tag": "Var"
},
"segment": "n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "##Nat.drop",
"tag": "TermReference"
},
"segment": "-"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "NumericLiteral"
},
"segment": "1"
},
{
"annotation": {
"tag": "Parenthesis"
},
"segment": ")"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": "else"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "#nirp5os0q69o4e1u9p3t6mmq6l6otluefi3ksm7dhm0diidjvkkgl8o9bvnflbj0sanuvdusf34f1qrins3ktcaglpcqv9oums2slsg#d1",
"tag": "TermReference"
},
"segment": "None"
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "DelimiterChar"
},
"segment": "{"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "r"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "DelimiterChar"
},
"segment": "}"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": "->"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "#nirp5os0q69o4e1u9p3t6mmq6l6otluefi3ksm7dhm0diidjvkkgl8o9bvnflbj0sanuvdusf34f1qrins3ktcaglpcqv9oums2slsg#d0",
"tag": "TermReference"
},
"segment": "Some"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "r"
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": "if"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "##Nat.>",
"tag": "TermReference"
},
"segment": ">"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "NumericLiteral"
},
"segment": "0"
},
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": " then"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": "handle"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "s"
},
{
"annotation": {
"tag": "Unit"
},
"segment": "()"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": "with"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "h"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Parenthesis"
},
"segment": "("
},
{
"annotation": {
"tag": "Var"
},
"segment": "n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "##Nat.drop",
"tag": "TermReference"
},
"segment": "-"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "NumericLiteral"
},
"segment": "1"
},
{
"annotation": {
"tag": "Parenthesis"
},
"segment": ")"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": "else"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "#nirp5os0q69o4e1u9p3t6mmq6l6otluefi3ksm7dhm0diidjvkkgl8o9bvnflbj0sanuvdusf34f1qrins3ktcaglpcqv9oums2slsg#d1",
"tag": "TermReference"
},
"segment": "None"
}
],
"tag": "UserObject"
},
"termDocs": [],
"termNames": [
"take"
]
},
"oldBranchRef": "main",
"oldTerm": {
"bestTermName": "take",
"defnTermTag": "Plain",
"signature": [
{
"annotation": {
"contents": "##Nat",
"tag": "TypeReference"
},
"segment": "Nat"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "TypeOperator"
},
"segment": "->"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "DelayForceChar"
},
"segment": "'"
},
{
"annotation": {
"tag": "AbilityBraces"
},
"segment": "{"
},
{
"annotation": {
"tag": "Var"
},
"segment": "g"
},
{
"annotation": {
"tag": "AbilityBraces"
},
"segment": "}"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "t"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "TypeOperator"
},
"segment": "->"
},
{
"annotation": {
"tag": "AbilityBraces"
},
"segment": "{"
},
{
"annotation": {
"tag": "Var"
},
"segment": "g"
},
{
"annotation": null,
"segment": ","
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "#b035k0tpdv9jbs80ig29hujmv9kpkubda6or4320o5g7aj7edsudislnp2uovntgu5b0e6a18p0p7j8r2hcpr20blls7am8nll6t2ro",
"tag": "TypeReference"
},
"segment": "Stream"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "a"
},
{
"annotation": {
"tag": "AbilityBraces"
},
"segment": "}"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "#nirp5os0q69o4e1u9p3t6mmq6l6otluefi3ksm7dhm0diidjvkkgl8o9bvnflbj0sanuvdusf34f1qrins3ktcaglpcqv9oums2slsg",
"tag": "TypeReference"
},
"segment": "Optional"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "t"
}
],
"termDefinition": {
"contents": [
{
"annotation": {
"contents": "take",
"tag": "HashQualifier"
},
"segment": "take"
},
{
"annotation": {
"tag": "TypeAscriptionColon"
},
"segment": " :"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "##Nat",
"tag": "TypeReference"
},
"segment": "Nat"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "TypeOperator"
},
"segment": "->"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "DelayForceChar"
},
"segment": "'"
},
{
"annotation": {
"tag": "AbilityBraces"
},
"segment": "{"
},
{
"annotation": {
"tag": "Var"
},
"segment": "g"
},
{
"annotation": {
"tag": "AbilityBraces"
},
"segment": "}"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "t"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "TypeOperator"
},
"segment": "->"
},
{
"annotation": {
"tag": "AbilityBraces"
},
"segment": "{"
},
{
"annotation": {
"tag": "Var"
},
"segment": "g"
},
{
"annotation": null,
"segment": ","
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "#b035k0tpdv9jbs80ig29hujmv9kpkubda6or4320o5g7aj7edsudislnp2uovntgu5b0e6a18p0p7j8r2hcpr20blls7am8nll6t2ro",
"tag": "TypeReference"
},
"segment": "Stream"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "a"
},
{
"annotation": {
"tag": "AbilityBraces"
},
"segment": "}"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "#nirp5os0q69o4e1u9p3t6mmq6l6otluefi3ksm7dhm0diidjvkkgl8o9bvnflbj0sanuvdusf34f1qrins3ktcaglpcqv9oums2slsg",
"tag": "TypeReference"
},
"segment": "Optional"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "t"
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": {
"contents": "take",
"tag": "HashQualifier"
},
"segment": "take"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "s"
},
{
"annotation": {
"tag": "BindingEquals"
},
"segment": " ="
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "UseKeyword"
},
"segment": "use "
},
{
"annotation": {
"tag": "UsePrefix"
},
"segment": "Nat"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "UseSuffix"
},
"segment": "-"
},
{
"annotation": {
"tag": "UseSuffix"
},
"segment": " "
},
{
"annotation": {
"tag": "UseSuffix"
},
"segment": ">"
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "h",
"tag": "HashQualifier"
},
"segment": "h"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "n"
},
{
"annotation": {
"tag": "BindingEquals"
},
"segment": " ="
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": "cases"
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "DelimiterChar"
},
"segment": "{"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "#b035k0tpdv9jbs80ig29hujmv9kpkubda6or4320o5g7aj7edsudislnp2uovntgu5b0e6a18p0p7j8r2hcpr20blls7am8nll6t2ro#a0",
"tag": "TermReference"
},
"segment": "emit"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "a"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": "->"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "k"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "DelimiterChar"
},
"segment": "}"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": "->"
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": null,
"segment": " "
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": "if "
},
{
"annotation": {
"tag": "Var"
},
"segment": "n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "##Nat.>",
"tag": "TermReference"
},
"segment": ">"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "NumericLiteral"
},
"segment": "0"
},
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": " then"
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": null,
"segment": " "
},
{
"annotation": null,
"segment": " "
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "#b035k0tpdv9jbs80ig29hujmv9kpkubda6or4320o5g7aj7edsudislnp2uovntgu5b0e6a18p0p7j8r2hcpr20blls7am8nll6t2ro#a0",
"tag": "TermReference"
},
"segment": "emit"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "a"
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": null,
"segment": " "
},
{
"annotation": null,
"segment": " "
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": "handle"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "k"
},
{
"annotation": {
"tag": "Unit"
},
"segment": "()"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": "with"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "h"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Parenthesis"
},
"segment": "("
},
{
"annotation": {
"tag": "Var"
},
"segment": "n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "##Nat.drop",
"tag": "TermReference"
},
"segment": "-"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "NumericLiteral"
},
"segment": "1"
},
{
"annotation": {
"tag": "Parenthesis"
},
"segment": ")"
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": null,
"segment": " "
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": "else"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "#nirp5os0q69o4e1u9p3t6mmq6l6otluefi3ksm7dhm0diidjvkkgl8o9bvnflbj0sanuvdusf34f1qrins3ktcaglpcqv9oums2slsg#d1",
"tag": "TermReference"
},
"segment": "None"
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "DelimiterChar"
},
"segment": "{"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "r"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "DelimiterChar"
},
"segment": "}"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": "->"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "#nirp5os0q69o4e1u9p3t6mmq6l6otluefi3ksm7dhm0diidjvkkgl8o9bvnflbj0sanuvdusf34f1qrins3ktcaglpcqv9oums2slsg#d0",
"tag": "TermReference"
},
"segment": "Some"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "r"
},
{
"annotation": null,
"segment": "\n"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": "handle"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "s"
},
{
"annotation": {
"tag": "Unit"
},
"segment": "()"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "ControlKeyword"
},
"segment": "with"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "h"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "n"
}
],
"tag": "UserObject"
},
"termDocs": [],
"termNames": [
"take"
]
},
"project": "diffs"
}
```
Terminate API code blocks correctly They were missing trailing newlines, so as you can see in the diff, some transcripts had invalid output.
2024-07-10 22:15:33 +03:00
Diff types
Transcripts
2024-05-18 05:08:11 +03:00
Add a space before code block info strings This is for consistency with the `cmark` style. Now the blocks we still pretty-print ourselves will match the bulk of them that `cmark` produces.
2024-07-10 19:17:15 +03:00
``` api
Add definition diff apis and tests
2024-05-17 19:43:19 +03:00
GET /api/projects/diffs/diff/types?oldBranchRef=main&newBranchRef=new&oldType=Type&newType=Type
{
"diff": {
"contents": [
{
"diffTag": "both",
"elements": [
{
"annotation": {
"tag": "DataTypeKeyword"
},
"segment": "type"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "Type",
"tag": "HashQualifier"
},
"segment": "Type"
}
]
},
{
"diffTag": "new",
"elements": [
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "DataTypeParams"
},
"segment": "a"
}
]
},
{
"diffTag": "both",
"elements": [
{
"annotation": {
"tag": "DelimiterChar"
},
"segment": " = "
}
]
},
{
"diffTag": "annotationChange",
"fromAnnotation": {
Add regression test
2024-08-09 20:21:19 +03:00
"contents": "#m5hlrmkn9a3kuqabta2e9qs934em1qmkotpsh9tjvta2u86nuesbjbk2k2sprbdiljq7uqibp49vku4gfpg2u60ceiv8net1f0bu2n8#d0",
Add definition diff apis and tests
2024-05-17 19:43:19 +03:00
"tag": "TermReference"
},
"segment": "Type",
"toAnnotation": {
Add regression test
2024-08-09 20:21:19 +03:00
"contents": "#uik7pl3klg4u2obtf2fattdaeldui46ohmsi0knpp5hu8tn4d5o8vp570qgh7esgap0pmq9cfrh9dfg1r8qa7qh33g45a3tric24o20#d0",
Add definition diff apis and tests
2024-05-17 19:43:19 +03:00
"tag": "TermReference"
}
},
{
"diffTag": "both",
"elements": [
{
"annotation": null,
"segment": " "
}
]
},
{
"diffTag": "old",
"elements": [
{
"annotation": {
"contents": "##Nat",
"tag": "TypeReference"
},
"segment": "Nat"
}
]
},
{
"diffTag": "new",
"elements": [
{
"annotation": {
"tag": "Var"
},
"segment": "a"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "##Text",
"tag": "TypeReference"
},
"segment": "Text"
}
]
}
],
"tag": "UserObject"
},
"diffKind": "diff",
"newBranchRef": "new",
"newType": {
"bestTypeName": "Type",
"defnTypeTag": "Data",
"typeDefinition": {
"contents": [
{
"annotation": {
"tag": "DataTypeKeyword"
},
"segment": "type"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "Type",
"tag": "HashQualifier"
},
"segment": "Type"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "DataTypeParams"
},
"segment": "a"
},
{
"annotation": {
"tag": "DelimiterChar"
},
"segment": " = "
},
{
"annotation": {
Add regression test
2024-08-09 20:21:19 +03:00
"contents": "#uik7pl3klg4u2obtf2fattdaeldui46ohmsi0knpp5hu8tn4d5o8vp570qgh7esgap0pmq9cfrh9dfg1r8qa7qh33g45a3tric24o20#d0",
Add definition diff apis and tests
2024-05-17 19:43:19 +03:00
"tag": "TermReference"
},
"segment": "Type"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"tag": "Var"
},
"segment": "a"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "##Text",
"tag": "TypeReference"
},
"segment": "Text"
}
],
"tag": "UserObject"
},
"typeDocs": [],
"typeNames": [
"Type"
]
},
"oldBranchRef": "main",
"oldType": {
"bestTypeName": "Type",
"defnTypeTag": "Data",
"typeDefinition": {
"contents": [
{
"annotation": {
"tag": "DataTypeKeyword"
},
"segment": "type"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "Type",
"tag": "HashQualifier"
},
"segment": "Type"
},
{
"annotation": {
"tag": "DelimiterChar"
},
"segment": " = "
},
{
"annotation": {
Add regression test
2024-08-09 20:21:19 +03:00
"contents": "#m5hlrmkn9a3kuqabta2e9qs934em1qmkotpsh9tjvta2u86nuesbjbk2k2sprbdiljq7uqibp49vku4gfpg2u60ceiv8net1f0bu2n8#d0",
Add definition diff apis and tests
2024-05-17 19:43:19 +03:00
"tag": "TermReference"
},
"segment": "Type"
},
{
"annotation": null,
"segment": " "
},
{
"annotation": {
"contents": "##Nat",
"tag": "TypeReference"
},
"segment": "Nat"
}
],
"tag": "UserObject"
},
"typeDocs": [],
"typeNames": [
"Type"
]
},
"project": "diffs"
}
Terminate API code blocks correctly They were missing trailing newlines, so as you can see in the diff, some transcripts had invalid output.
2024-07-10 22:15:33 +03:00
```
Reference in New Issue Copy Permalink